chromeos: Remove PowerStateOverride.

chrome/browser/chromeos/chrome_browser_main_chromeos.h

 // 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_CHROME_BROWSER_MAIN_CHROMEOS_H_
 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chrome_browser_main_linux.h"
 #include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/common/cancelable_task_tracker.h"
 
 namespace contacts {
 class ContactManager;
 }
 
+namespace content {
+class PowerSaveBlocker;
+}
+
 namespace chromeos {
 
 class BrightnessObserver;
 class DisplayConfigurationObserver;
 class KioskAppLauncher;
 class MagnificationManager;
 class OutputObserver;
 class PowerButtonObserver;
-class PowerStateOverride;
 class ResumeObserver;
 class ScreenDimmingObserver;
 class ScreenLockObserver;
 class ScreensaverController;
 class SessionManagerObserver;
 class StorageMonitorCros;
 class SuspendObserver;
 class UserActivityNotifier;
 class VideoActivityNotifier;
 
@@ skipping 43 matching lines @@
   scoped_ptr<contacts::ContactManager> contact_manager_;
   scoped_ptr<BrightnessObserver> brightness_observer_;
   scoped_ptr<DisplayConfigurationObserver> display_configuration_observer_;
   scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
   scoped_ptr<OutputObserver> output_observer_;
   scoped_ptr<SuspendObserver> suspend_observer_;
   scoped_ptr<ResumeObserver> resume_observer_;
   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_;
   scoped_refptr<StorageMonitorCros> storage_monitor_;
   scoped_ptr<system::AutomaticRebootManager> automatic_reboot_manager_;
 
   scoped_ptr<internal::DBusServices> dbus_services_;
 
   VersionLoader cros_version_loader_;
   CancelableTaskTracker tracker_;
   bool use_new_network_change_notifier_;
 
   scoped_ptr<KioskAppLauncher> kiosk_app_launcher_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_