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

Unified Diff: chrome/browser/chromeos/preferences.cc

Issue 8573025: chromeos: Move EnableScreenLock to PowerManagerClient from PowerLibrary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 9 years, 1 month 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/chromeos/preferences.cc
diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc
index 4aee054fb852f79c416ce22e74c986242674185e..2cfd84ef102c92f13444757b672732dc4f8a4dc4 100644
--- a/chrome/browser/chromeos/preferences.cc
+++ b/chrome/browser/chromeos/preferences.cc
@@ -11,12 +11,11 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/power_library.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/login_utils.h"
+#include "chrome/browser/chromeos/system/screen_locker_settings.h"
#include "chrome/browser/chromeos/system/touchpad_settings.h"
#include "chrome/browser/prefs/pref_member.h"
#include "chrome/browser/prefs/pref_service.h"
@@ -456,7 +455,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {
// Init or update power manager config.
if (!pref_name || *pref_name == prefs::kEnableScreenLock) {
- CrosLibrary::Get()->GetPowerLibrary()->EnableScreenLock(
+ system::screen_locker_settings::EnableScreenLock(
enable_screen_lock_.GetValue());
}
}
« no previous file with comments | « chrome/browser/chromeos/cros/power_library.cc ('k') | chrome/browser/chromeos/system/screen_locker_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698