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

Unified Diff: chrome/test/base/view_event_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 | « chrome/browser/ui/webui/feedback_ui.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/view_event_test_base.cc
diff --git a/chrome/test/base/view_event_test_base.cc b/chrome/test/base/view_event_test_base.cc
index cab4dae9d39838780b392a1ddc0eaf57e7a61690..9c14d7c94e313639bc9c8019b460310f759c8262 100644
--- a/chrome/test/base/view_event_test_base.cc
+++ b/chrome/test/base/view_event_test_base.cc
@@ -87,7 +87,7 @@ void ViewEventTestBase::SetUp() {
ash::Shell::CreateInstance(NULL);
// The shell runs with a locked screen in tests, so we must clear the event
// client so it doesn't interfere with event propagation.
- aura::client::SetEventClient(ash::Shell::GetInstance()->GetRootWindow(),
+ aura::client::SetEventClient(ash::Shell::GetPrimaryRootWindow(),
NULL);
#endif
window_ = views::Widget::CreateWindow(this);
« no previous file with comments | « chrome/browser/ui/webui/feedback_ui.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698