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

Unified Diff: ash/wm/system_gesture_event_filter_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/wm/system_gesture_event_filter.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter_unittest.cc
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index 6ef332df5859e6875275fe01d7bbb92e1389b7f9..ed2fcb80e2e571fa96526c62cd084c105544380f 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -100,7 +100,7 @@ typedef test::AshTestBase SystemGestureEventFilterTest;
// Ensure that events targeted at the root window are consumed by the
// system event handler.
TEST_F(SystemGestureEventFilterTest, TapOutsideRootWindow) {
- aura::RootWindow* root_window = Shell::GetRootWindow();
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
Shell::TestApi shell_test(Shell::GetInstance());
@@ -132,7 +132,7 @@ TEST_F(SystemGestureEventFilterTest, TapOutsideRootWindow) {
// Ensure that a three fingered swipe is consumed by the system event handler.
TEST_F(SystemGestureEventFilterTest, ThreeFingerSwipe) {
- aura::RootWindow* root_window = Shell::GetRootWindow();
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
const int kTouchId = 5;
@@ -159,7 +159,7 @@ TEST_F(SystemGestureEventFilterTest, ThreeFingerSwipe) {
// Ensure that the device control operation gets properly handled.
TEST_F(SystemGestureEventFilterTest, DeviceControl) {
- aura::RootWindow* root_window = Shell::GetRootWindow();
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
gfx::Rect screen = gfx::Screen::GetPrimaryMonitor().bounds();
int ypos_half = screen.height() / 2;
@@ -269,7 +269,7 @@ TEST_F(SystemGestureEventFilterTest, DeviceControl) {
// Ensure that the application control operations gets properly handled.
TEST_F(SystemGestureEventFilterTest, ApplicationControl) {
- aura::RootWindow* root_window = Shell::GetRootWindow();
+ aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();
gfx::Rect screen = gfx::Screen::GetPrimaryMonitor().bounds();
int ypos_half = screen.height() / 2;
« no previous file with comments | « ash/wm/system_gesture_event_filter.cc ('k') | ash/wm/system_modal_container_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698