chromeos: Remove PowerStateOverride.

chrome/browser/chromeos/chrome_browser_main_chromeos.h

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index f80bfd397067c3a38250413d6b97cba64a783b83..7a1a8ebfc3b2905cec3ce79fc249d720ed8bf4f7 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -15,6 +15,10 @@ namespace contacts {
 class ContactManager;
 }
 
+namespace content {
+class PowerSaveBlocker;
+}
+
 namespace chromeos {
 
 class BrightnessObserver;
@@ -23,7 +27,6 @@ class KioskAppLauncher;
 class MagnificationManager;
 class OutputObserver;
 class PowerButtonObserver;
-class PowerStateOverride;
 class ResumeObserver;
 class ScreenDimmingObserver;
 class ScreenLockObserver;
@@ -87,7 +90,7 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
   scoped_ptr<ScreenLockObserver> screen_lock_observer_;
   scoped_ptr<ScreensaverController> screensaver_controller_;
   scoped_ptr<PowerButtonObserver> power_button_observer_;
-  scoped_refptr<PowerStateOverride> power_state_override_;
+  scoped_ptr<content::PowerSaveBlocker> kiosk_mode_power_save_blocker_;

[bartfab (slow), 2013/03/21 14:22:26]

Since we renamed "kiosk mode" to "retail mode" a long time ago, I'd prefer
retail_mode over kiosk_mode in new variables.

[Daniel Erat, 2013/03/21 14:48:46]

Any plans to rename the rest of the code (e.g. classes) to match soon? 
Referring to the feature as two different things within the code seems like the
worst of both worlds to me.

[bartfab (slow), 2013/03/21 15:34:38]

The situation already is bad: We have at least three distinct, entirely
unrelated features that are called "kiosk mode". Any new code we add that refers
to "kiosk mode" only adds to the confusion.

We do not plan to rename any of the existing components though, at least not for
retail mode - retail mode is expected to go away as soon as public sessions are
ready to take its place.

[Daniel Erat, 2013/03/21 15:42:30]

Ugh, I see.  Thanks for the explanation.

   scoped_ptr<UserActivityNotifier> user_activity_notifier_;
   scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
   scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;