diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 07:23:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 07:23:26 +0000 |
| commit | 877360ea4b4863c70100283d521f408829738d88 (patch) | |
| tree | 885d993c6a298dbabc899cca08269b10f3ffb279 /ash/display | |
| parent | e43cc327407f7a2f05d9d9a03f9366b02b5e8da4 (diff) | |
| download | chromium_src-877360ea4b4863c70100283d521f408829738d88.zip chromium_src-877360ea4b4863c70100283d521f408829738d88.tar.gz chromium_src-877360ea4b4863c70100283d521f408829738d88.tar.bz2 | |
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
Diffstat (limited to 'ash/display')
| -rw-r--r-- | ash/display/display_controller.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_controller.cc b/ash/display/display_controller.cc index 579975a..73c1aa0 100644 --- a/ash/display/display_controller.cc +++ b/ash/display/display_controller.cc @@ -768,8 +768,8 @@ aura::RootWindow* DisplayController::AddRootWindowForDisplay( display.id(); root_window->Init(); - root_windows_[display.id()] = root_window->window(); - SetDisplayPropertiesOnHostWindow(root_window, display); + root_windows_[display.id()] = root_window; + SetDisplayPropertiesOnHostWindow(root_window->GetDispatcher(), display); #if defined(OS_CHROMEOS) static bool force_constrain_pointer_to_root = |