summaryrefslogtreecommitdiffstats
path: root/ash/display
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 23:44:38 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-12 23:44:38 +0000
commitd17642d2c22bb470d19649619c277a7a61986c7a (patch)
treee507bde67abb8db5b20ce34dddb705f2c3f59398 /ash/display
parentad3291b99ca2614b7d5bbdd90074d18963765109 (diff)
downloadchromium_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/display')
-rw-r--r--ash/display/screen_position_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/display/screen_position_controller.cc b/ash/display/screen_position_controller.cc
index 8c37efe..b416d38 100644
--- a/ash/display/screen_position_controller.cc
+++ b/ash/display/screen_position_controller.cc
@@ -197,7 +197,7 @@ void ScreenPositionController::SetBounds(aura::Window* window,
// Restore focused/active window.
if (tracker.Contains(focused)) {
aura::client::GetFocusClient(window)->FocusWindow(focused);
- ash::Shell::GetInstance()->set_active_root_window(
+ ash::Shell::GetInstance()->set_target_root_window(
focused->GetRootWindow());
} else if (tracker.Contains(active)) {
activation_client->ActivateWindow(active);