chrome/browser/chromeos/preferences.cc - Issue 8573025: chromeos: Move EnableScreenLock to PowerManagerClient from PowerLibrary

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 8573025: chromeos: Move EnableScreenLock to PowerManagerClient from PowerLibrary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Removed power_manager_client.cc from patch 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

« no previous file with comments | « chrome/browser/chromeos/cros/power_library.cc ('k') | chrome/browser/chromeos/system/screen_locker_settings.h » ('j') | chrome/browser/chromeos/system/screen_locker_settings.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.cc

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

index 4aee054fb852f79c416ce22e74c986242674185e..ab2bd254a05e33afc9fcdf04aeffc1152edc726e 100644

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

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

@@ -11,12 +11,13 @@

#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/dbus/dbus_thread_manager.h"

+#include "chrome/browser/chromeos/dbus/power_manager_client.h"

satorux1 2011/11/16 23:58:04 You don't need this.

Simon Que 2011/11/18 18:56:08 Done.

#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 +457,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());

}