ash/wm/window_manager_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/wm/window_manager_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/wm/window_manager_unittest.cc

diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc

index 18177af332d4a835dfee1d16a0d4cbafd75acc2c..a978ef575437f70fea1533e99009e381819224c9 100644

--- a/ash/wm/window_manager_unittest.cc

+++ b/ash/wm/window_manager_unittest.cc

@@ -15,12 +15,12 @@

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

#include "ui/base/cursor/cursor.h"

#include "ui/base/hit_test.h"

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

#include "ui/events/event.h"

#include "ui/events/event_processor.h"

#include "ui/events/event_utils.h"

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

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

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

#include "ui/wm/core/compound_event_filter.h"

#include "ui/wm/public/activation_client.h"

#include "ui/wm/public/activation_delegate.h"

@@ -601,7 +601,7 @@ TEST_F(WindowManagerTest, MAYBE_TransformActivate) {

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

gfx::Size size = root_window->bounds().size();

EXPECT_EQ(gfx::Rect(size).ToString(),

- gfx::Screen::GetScreen()

+ display::Screen::GetScreen()

->GetDisplayNearestPoint(gfx::Point())

.bounds()

.ToString());

« no previous file with comments | « ash/wm/window_cycle_controller_unittest.cc ('k') | ash/wm/window_positioner.h » ('j') | no next file with comments »