chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome

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: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

Issue 1920263003: Rename gfx::Display/Screen to display::Display/Screen in chrome (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

« chrome/browser/thumbnails/simple_thumbnail_crop.cc ('K') | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.cc » ('j') | chrome/browser/ui/autofill/popup_view_common.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

index 057118dc8a2eacb50f522d1d79c84302611d937c..b2fe61f99302a245d180cd482dbd8b81da347eca 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -1764,8 +1764,9 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,

// Open the app list menu and check that the drag and drop host was set.

gfx::Rect app_list_bounds =

test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();

- gfx::Display display =

- gfx::Screen::GetScreen()->GetDisplayNearestWindow(secondary_root_window);

+ display::Display display =

+ display::Screen::GetScreen()->GetDisplayNearestWindow(

+ secondary_root_window);

const gfx::Point& origin = display.bounds().origin();

app_list_bounds.Offset(-origin.x(), -origin.y());