chrome/browser/chromeos/login/lock/webui_screen_locker.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/login/lock/webui_screen_locker.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/input_method/mode_indicator_browsertest.cc ('k') | chrome/browser/chromeos/login/ui/login_display_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/lock/webui_screen_locker.cc

diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc

index 48acb307dae934d8bca197830901a1f2b6e8ec5b..7d7d60a2eaf911bd1c84051b615ca2011d3a8963 100644

--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc

+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc

@@ -70,7 +70,7 @@ WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)

set_should_emit_login_prompt_visible(false);

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

ash::Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);

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

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

DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);

if (keyboard::KeyboardController::GetInstance()) {

@@ -164,7 +164,7 @@ void WebUIScreenLocker::ResetAndFocusUserPod() {

WebUIScreenLocker::~WebUIScreenLocker() {

DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);

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

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

ash::Shell::GetInstance()->

lock_state_controller()->RemoveObserver(this);