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

Index: chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

index e016bb5a818f0a63e96c1c97bf0ef2f03eeb68a4..ca93ce775c5e50dfe437cd2918015726450d009d 100644

--- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

+++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc

@@ -4,7 +4,6 @@

#include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h"

-#include "ash/shell.h"

#include "base/bind.h"

#include "base/command_line.h"

#include "base/logging.h"

@@ -77,7 +76,7 @@ void KioskModeIdleAppNameNotification::Setup() {

void KioskModeIdleAppNameNotification::OnUserActivity(const ui::Event* event) {

if (show_notification_upon_next_user_activity_) {

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

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

// Display the notification only on internal display.

if (display.IsInternal()) {

base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();