chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.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/views/link_disambiguation/link_disambiguation_popup.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

« no previous file with comments | « chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc ('k') | chrome/browser/ui/views/message_center/web_notification_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

diff --git a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

index 8cdde9c4a0361b52f52c4d68af97b4f4c569094d..1648a94172d4feca8b40f532d0f0414453cbb77f 100644

--- a/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

+++ b/chrome/browser/ui/views/link_disambiguation/link_disambiguation_popup.cc

@@ -6,14 +6,14 @@

#include "base/macros.h"

#include "ui/aura/client/screen_position_client.h"

+#include "ui/display/display.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/gesture_event_details.h"

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

#include "ui/gfx/image/image.h"

#include "ui/gfx/image/image_skia.h"

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

#include "ui/views/bubble/bubble_dialog_delegate.h"

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

@@ -182,8 +182,8 @@ void LinkDisambiguationPopup::Show(

target_screen.y() - (zoomed_bitmap.height() / 2),

zoomed_bitmap.width(),

zoomed_bitmap.height());

- const gfx::Display display =

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

+ const display::Display display =

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

window_bounds.AdjustToFit(display.work_area());

view_->GetWidget()->SetBounds(window_bounds);

view_->GetWidget()->Show();