ash/wm/system_gesture_event_filter_unittest.cc - Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/system_gesture_event_filter_unittest.cc

Issue 10540123: Rename gfx::Screen::GetMonitorXXXX to gfx::Screen::GetDisplayXXX. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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:

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 5070b144b20a35bb22a2a620fde07f23409f212d..2ca46bf5021b8701b6faf8fa4d5f25efa4830847 100644

--- a/ash/wm/system_gesture_event_filter_unittest.cc

+++ b/ash/wm/system_gesture_event_filter_unittest.cc

@@ -14,10 +14,10 @@

#include "ash/volume_control_delegate.h"

#include "ash/wm/window_util.h"

#include "base/time.h"

-#include "ui/gfx/screen.h"

#include "ui/aura/event.h"

#include "ui/aura/root_window.h"

#include "ui/aura/test/test_windows.h"

+#include "ui/gfx/screen.h"

namespace ash {

namespace test {

@@ -134,7 +134,7 @@ TEST_F(SystemGestureEventFilterTest, TapOutsideRootWindow) {

TEST_F(SystemGestureEventFilterTest, DeviceControl) {

aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();

- gfx::Rect screen = gfx::Screen::GetPrimaryMonitor().bounds();

+ gfx::Rect screen = gfx::Screen::GetPrimaryDisplay().bounds();

int ypos_half = screen.height() / 2;

ash::AcceleratorController* accelerator =

@@ -244,7 +244,7 @@ TEST_F(SystemGestureEventFilterTest, DeviceControl) {

TEST_F(SystemGestureEventFilterTest, ApplicationControl) {

aura::RootWindow* root_window = Shell::GetPrimaryRootWindow();

- gfx::Rect screen = gfx::Screen::GetPrimaryMonitor().bounds();

+ gfx::Rect screen = gfx::Screen::GetPrimaryDisplay().bounds();

int ypos_half = screen.height() / 2;

aura::test::TestWindowDelegate delegate;