ash/accelerators/accelerator_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/accelerators/accelerator_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

« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/content/display/screen_orientation_controller_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ash/accelerators/accelerator_controller_unittest.cc

diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc

index fcb02b553c6cb792151fb7dd7ff90187d3f70b1a..37b74e7bf6cc8c3238efef06d0b63b4f2cabc86d 100644

--- a/ash/accelerators/accelerator_controller_unittest.cc

+++ b/ash/accelerators/accelerator_controller_unittest.cc

@@ -36,10 +36,10 @@

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

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

#include "ui/aura/window.h"

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

#include "ui/events/event.h"

#include "ui/events/event_processor.h"

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

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

#include "ui/message_center/message_center.h"

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

@@ -648,7 +648,7 @@ TEST_F(AcceleratorControllerTest, CenterWindowAccelerator) {

// Center the window using accelerator.

GetController()->PerformActionIfEnabled(WINDOW_POSITION_CENTER);

- gfx::Rect work_area = gfx::Screen::GetScreen()

+ gfx::Rect work_area = display::Screen::GetScreen()

->GetDisplayNearestWindow(window.get())

.work_area();

gfx::Rect bounds = window->GetBoundsInScreen();