chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc - Issue 10540091: Rename gfx::Monitor to gfx::Display

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/options2/chromeos/internet_options_handler2.cc

Issue 10540091: Rename gfx::Monitor to gfx::Display (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 6 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: chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

diff --git a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

index 7912627866d44b2705db1da7116288db7eab8b87..a905055f94bfce7b65109aa6ce345513ee65c368 100644

--- a/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

+++ b/chrome/browser/ui/webui/options2/chromeos/internet_options_handler2.cc

@@ -54,8 +54,8 @@

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

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

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

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

#include "ui/gfx/screen.h"

#include "ui/views/widget/widget.h"

@@ -1137,8 +1137,8 @@ Browser* InternetOptionsHandler::GetAppropriateBrowser() {

float InternetOptionsHandler::GetIconScaleFactor() {

gfx::NativeWindow window = GetNativeWindow();

- gfx::Monitor monitor = gfx::Screen::GetMonitorNearestWindow(window);

- return monitor.device_scale_factor();

+ gfx::Display display = gfx::Screen::GetMonitorNearestWindow(window);

+ return display.device_scale_factor();

}

void InternetOptionsHandler::NetworkCommandCallback(const ListValue* args) {

« no previous file with comments | « chrome/browser/ui/panels/display_settings_provider.cc ('k') | content/browser/renderer_host/dip_util.cc » ('j') | ui/gfx/screen.h » ('J')