chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc - Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell.

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/options/chromeos/core_chromeos_options_handler.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 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/options/chromeos/core_chromeos_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

index f5d1514f9cbf9038d11eafa8411f0577427714aa..8cb41508809a42768d9e5992cc37c34b5256d962 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

@@ -9,7 +9,7 @@

#include <utility>

#include "ash/common/session/session_state_delegate.h"

-#include "ash/shell.h"

+#include "ash/common/wm_shell.h"

#include "base/bind.h"

#include "base/location.h"

#include "base/macros.h"

@@ -296,7 +296,7 @@ base::Value* CoreChromeOSOptionsHandler::CreateValueForPref(

user_prefs->FindPreference(prefs::kEnableAutoScreenLock);

ash::SessionStateDelegate* delegate =

- ash::Shell::GetInstance()->session_state_delegate();

+ ash::WmShell::Get()->GetSessionStateDelegate();

if (pref && pref->IsUserModifiable() &&

delegate->ShouldLockScreenBeforeSuspending()) {

bool screen_lock = false;

« chrome/browser/ui/ash/network_connect_delegate_chromeos.cc ('K') | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | no next file » | no next file with comments »