ash : Decouple power button controller and session state controller.

ash/shell.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 ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 49 matching lines @@
 namespace ash {
 
 class AcceleratorController;
 class CapsLockDelegate;
 class DesktopBackgroundController;
 class DisplayController;
 class HighContrastController;
 class Launcher;
 class NestedDispatcherController;
 class PowerButtonController;
+class SessionStateController;

[Daniel Erat, 2012/10/11 15:08:30]

nit: fix alphabetization

[Denis Kuznetsov (DE-MUC), 2012/10/11 16:14:38]

Done.

 class ScreenAsh;
 class ShellDelegate;
 class ShellObserver;
 class SystemTrayDelegate;
 class SystemTray;
 class UserActivityDetector;
 class UserWallpaperDelegate;
 class VideoDetector;
 class WindowCycleController;
 
@@ skipping 182 matching lines @@
   }
   internal::OverlayEventFilter* overlay_filter() {
     return overlay_filter_.get();
   }
   DesktopBackgroundController* desktop_background_controller() {
     return desktop_background_controller_.get();
   }
   PowerButtonController* power_button_controller() {
     return power_button_controller_.get();
   }
+  SessionStateController* session_state_controller() {
+    return session_state_controller_.get();
+  }
   UserActivityDetector* user_activity_detector() {
     return user_activity_detector_.get();
   }
   VideoDetector* video_detector() {
     return video_detector_.get();
   }
   WindowCycleController* window_cycle_controller() {
     return window_cycle_controller_.get();
   }
   internal::FocusCycler* focus_cycler() {
@@ skipping 159 matching lines @@
   scoped_ptr<internal::ActivationController> activation_controller_;
   scoped_ptr<internal::CaptureController> capture_controller_;
   scoped_ptr<internal::WindowModalityController> window_modality_controller_;
   scoped_ptr<internal::DragDropController> drag_drop_controller_;
   scoped_ptr<internal::ResizeShadowController> resize_shadow_controller_;
   scoped_ptr<internal::ShadowController> shadow_controller_;
   scoped_ptr<internal::TooltipController> tooltip_controller_;
   scoped_ptr<internal::VisibilityController> visibility_controller_;
   scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
   scoped_ptr<PowerButtonController> power_button_controller_;
+  scoped_ptr<SessionStateController> session_state_controller_;
   scoped_ptr<UserActivityDetector> user_activity_detector_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<internal::FocusCycler> focus_cycler_;
   scoped_ptr<DisplayController> display_controller_;
   scoped_ptr<HighContrastController> high_contrast_controller_;
   scoped_ptr<internal::MagnificationController> magnification_controller_;
   scoped_ptr<aura::FocusManager> focus_manager_;
   scoped_ptr<aura::client::UserActionClient> user_action_client_;
   scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_;
@@ skipping 47 matching lines @@
 
   // Used by ash/shell.
   content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_