| 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;
|
|
|