ash/magnifier/magnification_controller_unittest.cc - Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash

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/magnifier/magnification_controller_unittest.cc

Issue 1924703002: Rename gfx::Display/Screen to display::Display/Screen in ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

Index: ash/magnifier/magnification_controller_unittest.cc

diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc

index 4df32b7a37fa009717618b2aacfebae6f489f293..1f734a82c8f3290b4a477c0720af4cd53a4dec7c 100644

--- a/ash/magnifier/magnification_controller_unittest.cc

+++ b/ash/magnifier/magnification_controller_unittest.cc

@@ -13,9 +13,9 @@

#include "ui/aura/window_tree_host.h"

#include "ui/base/ime/input_method.h"

#include "ui/chromeos/accessibility_types.h"

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

#include "ui/events/test/event_generator.h"

#include "ui/gfx/geometry/rect_conversions.h"

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

#include "ui/views/controls/textfield/textfield.h"

#include "ui/views/layout/fill_layout.h"

#include "ui/views/widget/widget.h"

@@ -695,7 +695,7 @@ TEST_F(MagnificationControllerTest, EnableMagnifierInUnifiedDesktop) {

GetMagnificationController()->SetEnabled(true);

- gfx::Screen* screen = gfx::Screen::GetScreen();

+ display::Screen* screen = display::Screen::GetScreen();

UpdateDisplay("500x500, 500x500");

EXPECT_EQ("0,0 1000x500", screen->GetPrimaryDisplay().bounds().ToString());

« no previous file with comments | « ash/magnifier/magnification_controller.cc ('k') | ash/magnifier/partial_magnification_controller.cc » ('j') | no next file with comments »