Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1389)

Unified Diff: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 2661283002: cros: Clean up SessionStateDelegate refs in Chrome (Closed)
Patch Set: update browser_finder_chromeos_unittest Created 3 years, 10 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 691bec88f20590fde7bb08f81a45f5b0c70f09ff..1133bfc3e10b2a18f6922bf601b6f41767c4ef65 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
@@ -8,8 +8,6 @@
#include <string>
#include <utility>
-#include "ash/common/session/session_state_delegate.h"
-#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "base/location.h"
#include "base/macros.h"
@@ -29,6 +27,7 @@
#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/ash/session_controller_client.h"
#include "chrome/browser/ui/webui/chromeos/ui_account_tweaks.h"
#include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
#include "chrome/common/pref_names.h"
@@ -295,10 +294,8 @@ base::Value* CoreChromeOSOptionsHandler::CreateValueForPref(
const PrefService::Preference* pref =
user_prefs->FindPreference(prefs::kEnableAutoScreenLock);
- ash::SessionStateDelegate* delegate =
- ash::WmShell::Get()->GetSessionStateDelegate();
if (pref && pref->IsUserModifiable() &&
- delegate->ShouldLockScreenAutomatically()) {
+ SessionControllerClient::ShouldLockScreenAutomatically()) {
bool screen_lock = false;
bool success = pref->GetValue()->GetAsBoolean(&screen_lock);
DCHECK(success);
« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc ('k') | components/user_manager/user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698