content/common/page_state_serialization.cc - Issue 1927463002: Rename gfx::Display/Screen to display::Display/Screen in content/

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: content/common/page_state_serialization.cc

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

Index: content/common/page_state_serialization.cc

diff --git a/content/common/page_state_serialization.cc b/content/common/page_state_serialization.cc

index b9670c2f244bc8920ac245e90f2b26cc2924c70d..7bbced3b3f582853ce4fb229b67ef5d483e2aad8 100644

--- a/content/common/page_state_serialization.cc

+++ b/content/common/page_state_serialization.cc

@@ -14,7 +14,7 @@

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "build/build_config.h"

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

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

namespace content {

namespace {

@@ -605,8 +605,9 @@ void ReadFrameState(SerializeObject* obj, bool is_top,

if (state->page_scale_factor) {

float device_scale_factor = g_device_scale_factor_for_testing;

if (!device_scale_factor) {

- device_scale_factor =

- gfx::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();

+ device_scale_factor = display::Screen::GetScreen()

+ ->GetPrimaryDisplay()

+ .device_scale_factor();

}

state->scroll_offset =

gfx::Point(state->scroll_offset.x() / state->page_scale_factor,

« no previous file with comments | « content/common/cursors/webcursor_unittest.cc ('k') | content/shell/browser/shell.h » ('j') | no next file with comments »