chrome/browser/ui/ash/launcher/browser_status_monitor.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/ui/ash/launcher/browser_status_monitor.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/extensions/display_info_provider_win.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/browser_status_monitor.cc

diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

index 55e4006542589462f05d72bfb3080a8165586243..efbe50e754d4eccf628d39dc9fe6bfe722d5e255 100644

--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc

@@ -128,7 +128,7 @@ BrowserStatusMonitor::BrowserStatusMonitor(

aura::client::GetActivationClient(*iter));

observed_root_windows_.Add(static_cast<aura::Window*>(*iter));

}

- ash::Shell::GetInstance()->GetScreen()->AddObserver(this);

+ gfx::Screen::GetScreen()->AddObserver(this);

}

browser_tab_strip_tracker_.Init(

@@ -139,7 +139,7 @@ BrowserStatusMonitor::~BrowserStatusMonitor() {

// This check needs for win7_aura. Without this, all tests in

// ChromeLauncherController will fail in win7_aura.

if (ash::Shell::HasInstance())

- ash::Shell::GetInstance()->GetScreen()->RemoveObserver(this);

+ gfx::Screen::GetScreen()->RemoveObserver(this);

chrome::SettingsWindowManager::GetInstance()->RemoveObserver(

settings_window_observer_.get());