chrome/browser/chromeos/display/output_protection_delegate.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/chromeos/display/output_protection_delegate.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/chromeos/display/display_preferences_unittest.cc ('k') | chrome/browser/chromeos/display/overscan_calibrator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/display/output_protection_delegate.cc

diff --git a/chrome/browser/chromeos/display/output_protection_delegate.cc b/chrome/browser/chromeos/display/output_protection_delegate.cc

index 2c347d07536db017e9c883be32f65fe33d987e00..af8c711f68a8604cdd17ff99e287448caae12a30 100644

--- a/chrome/browser/chromeos/display/output_protection_delegate.cc

+++ b/chrome/browser/chromeos/display/output_protection_delegate.cc

@@ -11,7 +11,7 @@

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/render_frame_host.h"

#include "content/public/browser/web_contents.h"

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

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

namespace chromeos {

@@ -22,10 +22,11 @@ bool GetCurrentDisplayId(content::RenderFrameHost* rfh, int64_t* display_id) {

DCHECK(rfh);

DCHECK(display_id);

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

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

if (!screen)

return false;

- gfx::Display display = screen->GetDisplayNearestWindow(rfh->GetNativeView());

+ display::Display display =

+ screen->GetDisplayNearestWindow(rfh->GetNativeView());

*display_id = display.id();

return true;

}