chrome/browser/ui/webui/chromeos/login/core_oobe_handler.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/webui/chromeos/login/core_oobe_handler.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/toolbar/toolbar_button.cc ('k') | chrome/browser/ui/webui/options/chromeos/display_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

index 743a6ebf5687c6b778ca0357e00a4e5961356888..d71d4986db60da79a4c9800c942fd10f5b76e53e 100644

--- a/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -30,9 +30,9 @@

#include "google_apis/google_api_keys.h"

#include "grit/components_strings.h"

#include "ui/chromeos/accessibility_types.h"

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

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

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

#include "ui/gfx/geometry/size.h"

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

#include "ui/keyboard/keyboard_controller.h"

namespace {

@@ -403,7 +403,8 @@ void CoreOobeHandler::UpdateKeyboardState() {

}

void CoreOobeHandler::UpdateClientAreaSize() {

- const gfx::Size& size = gfx::Screen::GetScreen()->GetPrimaryDisplay().size();

+ const gfx::Size& size =

+ display::Screen::GetScreen()->GetPrimaryDisplay().size();

SetClientAreaSize(size.width(), size.height());

}