diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 21:07:24 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 21:07:24 +0000 |
| commit | f7c05b242215b26ff09102fdf0bf9a911cec9329 (patch) | |
| tree | 9c77f68f230c22e29a15f5b78713c7ba335a8c01 /ash/display | |
| parent | 49939c1ac5bda33a232917ac126b5d233920aa2f (diff) | |
| download | chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.zip chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.tar.gz chromium_src-f7c05b242215b26ff09102fdf0bf9a911cec9329.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=234428
Review URL: https://codereview.chromium.org/68313003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234634 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 73c1aa0..579975a 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; - SetDisplayPropertiesOnHostWindow(root_window->GetDispatcher(), display); + root_windows_[display.id()] = root_window->window(); + SetDisplayPropertiesOnHostWindow(root_window, display); #if defined(OS_CHROMEOS) static bool force_constrain_pointer_to_root = |