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

chrome/browser/chromeos/power/power_button_observer.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 "chrome/browser/chromeos/power/power_button_observer.h"
 
 #include "ash/shell.h"
 #include "ash/system/user/login_status.h"
 #include "ash/wm/power_button_controller.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h"
+#include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 namespace {
 
 ash::user::LoginStatus GetCurrentLoginStatus() {
   const UserManager* user_manager = UserManager::Get();
   if (!user_manager->IsUserLoggedIn())
     return ash::user::LOGGED_IN_NONE;
 
   if (user_manager->GetLoggedInUser()->is_guest())
     return ash::user::LOGGED_IN_GUEST;
 
   return ash::user::LOGGED_IN_USER;
 }
 
 }  // namespace
 
 PowerButtonObserver::PowerButtonObserver() {
-  ash::Shell::GetInstance()->session_state_controller()->
-      SetDelegate(new SessionStateControllerDelegateChromeos);
+  ash::Shell::GetInstance()->power_button_controller()->
+      set_delegate(new PowerButtonControllerDelegateChromeos);
 
   registrar_.Add(
       this,
       chrome::NOTIFICATION_LOGIN_USER_CHANGED,
       content::NotificationService::AllSources());
   registrar_.Add(
       this,
       chrome::NOTIFICATION_APP_TERMINATING,
       content::NotificationService::AllSources());
   registrar_.Add(
@@ skipping 44 matching lines @@
       OnPowerButtonEvent(down, timestamp);
 }
 
 void PowerButtonObserver::LockButtonStateChanged(
     bool down, const base::TimeTicks& timestamp) {
   ash::Shell::GetInstance()->power_button_controller()->
       OnLockButtonEvent(down, timestamp);
 }
 
 void PowerButtonObserver::LockScreen() {
-  ash::Shell::GetInstance()->session_state_controller()->OnStartingLock();
+  ash::Shell::GetInstance()->power_button_controller()->OnStartingLock();
 }
 
 }  // namespace chromeos