Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(159)

Unified Diff: ash/monitor/multi_monitor_manager_unittest.cc

Issue 10442017: Rename GetRootWindow() -> GetPrimaryRootWindow() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: git-try -b linux_chromeos,win_aura Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/monitor/monitor_controller.cc ('k') | ash/screensaver/screensaver_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/monitor/multi_monitor_manager_unittest.cc
diff --git a/ash/monitor/multi_monitor_manager_unittest.cc b/ash/monitor/multi_monitor_manager_unittest.cc
index 60ea1ac8153f3f751a45797af3bf8631de706b7f..5ba3ebd70ddd926d1f8a3fb0cb568a5883666aaa 100644
--- a/ash/monitor/multi_monitor_manager_unittest.cc
+++ b/ash/monitor/multi_monitor_manager_unittest.cc
@@ -51,10 +51,10 @@ class MultiMonitorManagerTest : public test::AshTestBase,
virtual void SetUp() OVERRIDE {
AshTestBase::SetUp();
monitor_manager()->AddObserver(this);
- Shell::GetRootWindow()->AddObserver(this);
+ Shell::GetPrimaryRootWindow()->AddObserver(this);
}
virtual void TearDown() OVERRIDE {
- Shell::GetRootWindow()->RemoveObserver(this);
+ Shell::GetPrimaryRootWindow()->RemoveObserver(this);
monitor_manager()->RemoveObserver(this);
AshTestBase::TearDown();
}
@@ -94,7 +94,7 @@ class MultiMonitorManagerTest : public test::AshTestBase,
// aura::WindowObserver overrides:
virtual void OnWindowDestroying(aura::Window* window) {
- ASSERT_EQ(Shell::GetRootWindow(), window);
+ ASSERT_EQ(Shell::GetPrimaryRootWindow(), window);
root_window_destroyed_ = true;
}
« no previous file with comments | « ash/monitor/monitor_controller.cc ('k') | ash/screensaver/screensaver_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698