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

Unified Diff: ash/accelerators/accelerator_controller_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/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_unittest.cc
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 54b6f827d4274e2e024a7e53dcafe1c50d7899f8..67921c3b5b308ddbdaf016437c3939cac53f3a48 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -383,15 +383,15 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
#if defined(OS_WIN)
MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
aura::TranslatedKeyEvent key_event1(msg1, false);
- EXPECT_TRUE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event1));
+ EXPECT_TRUE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event1));
MSG msg2 = { NULL, WM_CHAR, L'A', 0 };
aura::TranslatedKeyEvent key_event2(msg2, true);
- EXPECT_FALSE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event2));
+ EXPECT_FALSE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event2));
MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
aura::TranslatedKeyEvent key_event3(msg3, false);
- EXPECT_FALSE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event3));
+ EXPECT_FALSE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event3));
#elif defined(USE_X11)
XEvent key_event;
ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
@@ -399,17 +399,17 @@ TEST_F(AcceleratorControllerTest, ProcessOnce) {
0,
&key_event);
aura::TranslatedKeyEvent key_event1(&key_event, false);
- EXPECT_TRUE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event1));
+ EXPECT_TRUE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event1));
aura::TranslatedKeyEvent key_event2(&key_event, true);
- EXPECT_FALSE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event2));
+ EXPECT_FALSE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event2));
ui::InitXKeyEventForTesting(ui::ET_KEY_RELEASED,
ui::VKEY_A,
0,
&key_event);
aura::TranslatedKeyEvent key_event3(&key_event, false);
- EXPECT_FALSE(Shell::GetRootWindow()->DispatchKeyEvent(&key_event3));
+ EXPECT_FALSE(Shell::GetPrimaryRootWindow()->DispatchKeyEvent(&key_event3));
#endif
EXPECT_EQ(1, target.accelerator_pressed_count());
}
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698