diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 23:44:38 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 23:44:38 +0000 |
| commit | d17642d2c22bb470d19649619c277a7a61986c7a (patch) | |
| tree | e507bde67abb8db5b20ce34dddb705f2c3f59398 /ash/shell.cc | |
| parent | ad3291b99ca2614b7d5bbdd90074d18963765109 (diff) | |
| download | chromium_src-d17642d2c22bb470d19649619c277a7a61986c7a.zip chromium_src-d17642d2c22bb470d19649619c277a7a61986c7a.tar.gz chromium_src-d17642d2c22bb470d19649619c277a7a61986c7a.tar.bz2 | |
Rename GetActiveRootWindow -> GetTargetRootWindow
Fixed wrong use of GetActiveRootWindow in couple of places.
BUG=266378
Review URL: https://chromiumcodereview.appspot.com/23461048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index badb7e4..45af8df 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -385,7 +385,7 @@ aura::RootWindow* Shell::GetPrimaryRootWindow() { } // static -aura::RootWindow* Shell::GetActiveRootWindow() { +aura::RootWindow* Shell::GetTargetRootWindow() { Shell* shell = GetInstance(); if (shell->scoped_target_root_window_) return shell->scoped_target_root_window_; @@ -656,9 +656,9 @@ void Shell::ShowContextMenu(const gfx::Point& location_in_screen, } void Shell::ToggleAppList(aura::Window* window) { - // If the context window is not given, show it on the active root window. + // If the context window is not given, show it on the target root window. if (!window) - window = GetActiveRootWindow(); + window = GetTargetRootWindow(); if (!app_list_controller_) app_list_controller_.reset(new internal::AppListController); app_list_controller_->SetVisible(!app_list_controller_->IsVisible(), window); |