chromeos: screen_locker_settings -> power_manager_settings

Rename it so it can contain code to set other power manager settings,
not just for screen locker.

BUG=chromium-os:32240
TEST=Build successfully.

Change-Id: I412b775c8679386262791e84e0b2575fe182872a
Signed-off-by: Simon Que <sque@chromium.org>

R=stevenjb@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10689101

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146031 0039d316-1c4b-4281-b951-d872f2087c98

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());
   }
 

chrome/browser/chromeos/system/screen_locker_settings.cc → chrome/browser/chromeos/system/power_manager_settings.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/system/screen_locker_settings.h"
+#include "chrome/browser/chromeos/system/power_manager_settings.h"
 
 #include "base/bind.h"
 #include "base/chromeos/chromeos_version.h"
@@ -33,7 +33,7 @@ void EnableScreenLockOnFileThread(bool enable) {
 
 namespace chromeos {
 namespace system {
-namespace screen_locker_settings {
+namespace power_manager_settings {
 
 void EnableScreenLock(bool enable) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -44,6 +44,6 @@ void EnableScreenLock(bool enable) {
       base::Bind(&EnableScreenLockOnFileThread, enable));
 }
 
-}  // namespace screen_locker_settings
+}  // namespace power_manager_settings
 }  // namespace system
 }  // namespace chromeos

chrome/browser/chromeos/system/screen_locker_settings.h → chrome/browser/chromeos/system/power_manager_settings.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_SCREEN_LOCKER_SETTINGS_H_
-#define CHROME_BROWSER_CHROMEOS_SYSTEM_SCREEN_LOCKER_SETTINGS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_POWER_MANAGER_SETTINGS_H_
+#define CHROME_BROWSER_CHROMEOS_SYSTEM_POWER_MANAGER_SETTINGS_H_
 #pragma once
 
 namespace chromeos {
 namespace system {
-namespace screen_locker_settings {
+namespace power_manager_settings {
 
 // Enables/disables screen locking.
 void EnableScreenLock(bool enabled);
 
-}  // namespace screen_locker_settings
+}  // namespace power_manager_settings
 }  // namespace system
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_SCREEN_LOCKER_SETTINGS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_SYSTEM_POWER_MANAGER_SETTINGS_H_

chrome/chrome_browser.gypi

@@ -878,8 +878,8 @@
         'browser/chromeos/system/name_value_pairs_parser.h',
         'browser/chromeos/system/pointer_device_observer.cc',
         'browser/chromeos/system/pointer_device_observer.h',
-        'browser/chromeos/system/screen_locker_settings.cc',
-        'browser/chromeos/system/screen_locker_settings.h',
+        'browser/chromeos/system/power_manager_settings.cc',
+        'browser/chromeos/system/power_manager_settings.h',
         'browser/chromeos/system/statistics_provider.cc',
         'browser/chromeos/system/statistics_provider.h',
         'browser/chromeos/system/sysinfo_provider.cc',