diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 04:18:26 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-09 04:18:26 +0000 |
| commit | 41baaed86e5d839be5ae6f2dcaf579cf50f52b76 (patch) | |
| tree | a4c315f0722aebe5a6835cc0b704c8e10779428a /ash/shell.cc | |
| parent | a6aef3040058ef7c87746f6fd39f1a37c52b94c6 (diff) | |
| download | chromium_src-41baaed86e5d839be5ae6f2dcaf579cf50f52b76.zip chromium_src-41baaed86e5d839be5ae6f2dcaf579cf50f52b76.tar.gz chromium_src-41baaed86e5d839be5ae6f2dcaf579cf50f52b76.tar.bz2 | |
Remove some uses of RootWindow in Ash.
Adds a window() accessor to RootWindow. This is redundant now but necessary for when RootWindow is no longer a RootWindow. A subsequent CL will sever that relationship.
R=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/67083004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 63f15d2..e25182f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -939,7 +939,7 @@ void Shell::InitKeyboard(internal::RootWindowController* root) { } } -void Shell::InitRootWindow(aura::RootWindow* root_window) { +void Shell::InitRootWindow(aura::Window* root_window) { DCHECK(activation_client_); DCHECK(visibility_controller_.get()); DCHECK(drag_drop_controller_.get()); |