Revert 162140 - ash : Decouple power button controller and session state controller.

ash/shell.cc

 // 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.
 
 #include "ash/shell.h"
 
 #include <algorithm>
 #include <string>
 
 #include "ash/accelerators/focus_manager_factory.h"
@@ skipping 28 matching lines @@
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/dialog_frame_view.h"
 #include "ash/wm/event_client_impl.h"
 #include "ash/wm/event_rewriter_event_filter.h"
 #include "ash/wm/overlay_event_filter.h"
 #include "ash/wm/power_button_controller.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/root_window_layout_manager.h"
 #include "ash/wm/screen_dimmer.h"
-#include "ash/wm/session_state_controller.h"
 #include "ash/wm/shadow_controller.h"
 #include "ash/wm/stacking_controller.h"
 #include "ash/wm/system_gesture_event_filter.h"
 #include "ash/wm/system_modal_container_event_filter.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
 #include "ash/wm/user_activity_detector.h"
 #include "ash/wm/video_detector.h"
 #include "ash/wm/visibility_controller.h"
 #include "ash/wm/window_cycle_controller.h"
 #include "ash/wm/window_modality_controller.h"
@@ skipping 181 matching lines @@
 
   // Destroy all child windows including widgets.
   display_controller_->CloseChildWindows();
 
   // These need a valid Shell instance to clean up properly, so explicitly
   // delete them before invalidating the instance.
   // Alphabetical.
   drag_drop_controller_.reset();
   magnification_controller_.reset();
   power_button_controller_.reset();
-  session_state_controller_.reset();
   resize_shadow_controller_.reset();
   shadow_controller_.reset();
   tooltip_controller_.reset();
   event_client_.reset();
   window_cycle_controller_.reset();
   capture_controller_.reset();
   nested_dispatcher_controller_.reset();
   user_action_client_.reset();
   visibility_controller_.reset();
 
@@ skipping 221 matching lines @@
 
   // Force Layout
   root_window_controller->root_window_layout()->OnWindowResized();
 
   // It needs to be created after OnWindowResized has been called, otherwise the
   // widget will not paint when restoring after a browser crash.  Also it needs
   // to be created after InitSecondaryDisplays() to initialize the wallpapers in
   // the correct size.
   user_wallpaper_delegate_->InitializeWallpaper();
 
-  session_state_controller_.reset(new SessionStateController);
-  power_button_controller_.reset(new PowerButtonController(
-      session_state_controller_.get()));
-  AddShellObserver(session_state_controller_.get());
+  power_button_controller_.reset(new PowerButtonController);
+  AddShellObserver(power_button_controller_.get());
 
   if (initially_hide_cursor_)
     cursor_manager_.ShowCursor(false);
 
   // Cursor might have been hidden by somethign other than chrome.
   // Let the first mouse event show the cursor.
   env_filter_->set_cursor_hidden_by_filter(true);
 }
 
 void Shell::AddEnvEventFilter(aura::EventFilter* filter) {
@@ skipping 255 matching lines @@
        iter != controllers.end(); ++iter) {
     if ((*iter)->GetSystemModalLayoutManager(window)->
             CanWindowReceiveEvents(window)) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace ash