chrome/browser/chromeos/net/network_portal_web_dialog.cc - Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen()

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/net/network_portal_web_dialog.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5

Patch Set: cros Created 4 years, 11 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/login/ui/login_display_host_impl.cc ('k') | chrome/browser/extensions/display_info_provider_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/net/network_portal_web_dialog.cc

diff --git a/chrome/browser/chromeos/net/network_portal_web_dialog.cc b/chrome/browser/chromeos/net/network_portal_web_dialog.cc

index 3b6db22c818858f246096f207b1bc6727dc0478a..364fbb7e88953910109177c12f2ad80abe28c2e0 100644

--- a/chrome/browser/chromeos/net/network_portal_web_dialog.cc

+++ b/chrome/browser/chromeos/net/network_portal_web_dialog.cc

@@ -4,13 +4,13 @@

#include "chrome/browser/chromeos/net/network_portal_web_dialog.h"

-#include "ash/shell.h"

#include "chrome/grit/generated_resources.h"

#include "components/captive_portal/captive_portal_detector.h"

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

#include "ui/base/ui_base_types.h"

#include "ui/gfx/display.h"

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

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

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

#include "url/gurl.h"

@@ -20,7 +20,7 @@ const float kNetworkPortalWebDialogWidthFraction = .8;

const float kNetworkPortalWebDialogHeightFraction = .8;

gfx::Size GetPortalDialogSize() {

- const gfx::Display display = ash::Shell::GetScreen()->GetPrimaryDisplay();

+ const gfx::Display display = gfx::Screen::GetScreen()->GetPrimaryDisplay();

gfx::Size display_size = display.size();