chrome/browser/chromeos/preferences.cc - Issue 10689101: chromeos: screen_locker_settings -> power_manager_settings

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/preferences.cc

Issue 10689101: chromeos: screen_locker_settings -> power_manager_settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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:

Index: chrome/browser/chromeos/preferences.cc

diff --git a/chrome/browser/chromeos/preferences.cc b/chrome/browser/chromeos/preferences.cc

index 6b6b41391d040b63438234ec4ba84c7897cd8b40..35de5cd2c1f42edb119670f7df19bfad6c716ca2 100644

--- a/chrome/browser/chromeos/preferences.cc

+++ b/chrome/browser/chromeos/preferences.cc

@@ -18,7 +18,7 @@

#include "chrome/browser/chromeos/login/login_utils.h"

#include "chrome/browser/chromeos/system/drm_settings.h"

#include "chrome/browser/chromeos/system/input_device_settings.h"

-#include "chrome/browser/chromeos/system/screen_locker_settings.h"

+#include "chrome/browser/chromeos/system/power_manager_settings.h"

#include "chrome/browser/chromeos/system/statistics_provider.h"

#include "chrome/browser/prefs/pref_member.h"

#include "chrome/browser/prefs/pref_service.h"

@@ -553,7 +553,7 @@ void Preferences::NotifyPrefChanged(const std::string* pref_name) {

// Init or update power manager config.

if (!pref_name || *pref_name == prefs::kEnableScreenLock) {

- system::screen_locker_settings::EnableScreenLock(

+ system::power_manager_settings::EnableScreenLock(

enable_screen_lock_.GetValue());

}

« no previous file with comments | « no previous file | chrome/browser/chromeos/system/power_manager_settings.h » ('j') | no next file with comments »