summaryrefslogtreecommitdiffstats
path: root/ash/magnifier
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/magnifier
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/magnifier')
-rw-r--r--ash/magnifier/magnification_controller.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index d3119ed..e796d182 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -456,14 +456,14 @@ void MagnificationControllerImpl::OnWindowDestroying(
// destroyed before the root windows get destroyed.
DCHECK(root_window);
- aura::RootWindow* active_root_window = Shell::GetActiveRootWindow();
- CHECK(active_root_window);
+ aura::RootWindow* target_root_window = Shell::GetTargetRootWindow();
+ CHECK(target_root_window);
- // The destroyed root window must not be active.
- CHECK_NE(active_root_window, root_window);
+ // The destroyed root window must not be target.
+ CHECK_NE(target_root_window, root_window);
// Don't redraw the old root window as it's being destroyed.
- SwitchTargetRootWindow(active_root_window, false);
- point_of_interest_ = active_root_window->bounds().CenterPoint();
+ SwitchTargetRootWindow(target_root_window, false);
+ point_of_interest_ = target_root_window->bounds().CenterPoint();
}
}