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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/test/ash_test_base.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/shell_unittest.cc ('k') | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_base.cc
diff --git a/ash/test/ash_test_base.cc b/ash/test/ash_test_base.cc
index 46291f9d2efbb3126dcaced164a12050a36f7296..b4b39b454f554f4e91cc833b28f0836592c31076 100644
--- a/ash/test/ash_test_base.cc
+++ b/ash/test/ash_test_base.cc
@@ -30,7 +30,7 @@ void AshTestBase::SetUp() {
ash::Shell::CreateInstance(delegate);
helper_.SetUp();
- helper_.InitRootWindow(Shell::GetRootWindow());
+ helper_.InitRootWindow(Shell::GetPrimaryRootWindow());
// Disable animations during tests.
ui::LayerAnimator::set_disable_animations_for_test(true);
@@ -57,7 +57,7 @@ void AshTestBase::ChangeMonitorConfig(float scale,
}
void AshTestBase::RunAllPendingInMessageLoop() {
- helper_.RunAllPendingInMessageLoop(Shell::GetRootWindow());
+ helper_.RunAllPendingInMessageLoop(Shell::GetPrimaryRootWindow());
}
} // namespace test
« no previous file with comments | « ash/shell_unittest.cc ('k') | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698