Revert 234435 "fix bustage 2"

> fix bustage 2

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/70023002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234447 0039d316-1c4b-4281-b951-d872f2087c98
Revert 234433 "fix bustage"

> fix bustage

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/70033002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234448 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 234447
SVN changes up to revision 234448
Revert 234428 "Make RootWindow not subclass Window."

> Make RootWindow not subclass Window.
> 
> Removes the #include of window.h from root_window.h too, which makes this CL a little longer bandaiding all those places.
> The interesting parts of this change are in root_window.* and window.*
> 
> R=sky@chromium.org
> http://crbug.com/308843
> 
> Review URL: https://codereview.chromium.org/68313003

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/70043002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234449 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 234449