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/root_window_controller.cc | |
| 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/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 3cfb6d2..c068809 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -583,7 +583,7 @@ void RootWindowController::Init(RootWindowType root_window_type, Shell::GetInstance()->InitRootWindow(root_window()); root_window_->SetCursor(ui::kCursorPointer); - CreateContainersInRootWindow(root_window_.get()); + CreateContainersInRootWindow(root_window_->window()); if (root_window_type == VIRTUAL_KEYBOARD) return; @@ -607,7 +607,8 @@ void RootWindowController::Init(RootWindowType root_window_type, } else { root_window_layout()->OnWindowResized(); shell->desktop_background_controller()->OnRootWindowAdded(root_window()); - shell->high_contrast_controller()->OnRootWindowAdded(root_window_.get()); + shell->high_contrast_controller()->OnRootWindowAdded( + root_window_->window()); root_window_->ShowRootWindow(); // Create a launcher if a user is already logged. |