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

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.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/ui/webui/chromeos/login/signin_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 26 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_switches.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(USE_AURA)
 #include "ash/shell.h"
-#include "ash/wm/session_state_controller.h"
+#include "ash/wm/power_button_controller.h"
 #endif
 
 using content::BrowserThread;
 using content::RenderViewHost;
 
 namespace {
 
 const char kDefaultDomain[] = "@gmail.com";
 
 // Account picker screen id.
@@ skipping 561 matching lines @@
 
   // Load auth extension. Parameters are: force reload, do not load extension in
   // background, use offline version.
   LoadAuthExtension(true, false, true);
   ShowScreen(kGaiaSigninScreen, NULL);
 }
 
 void SigninScreenHandler::HandleShutdownSystem(const base::ListValue* args) {
 #if defined(USE_AURA)
   // Display the shutdown animation before actually requesting shutdown.
-  ash::Shell::GetInstance()->session_state_controller()->RequestShutdown();
+  ash::Shell::GetInstance()->power_button_controller()->RequestShutdown();
 #else
   DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
 #endif
 }
 
 void SigninScreenHandler::HandleUserDeselected(const base::ListValue* args) {
   if (delegate_)
     delegate_->OnUserDeselected();
 }
 
@@ skipping 353 matching lines @@
                                     ConnectionType last_network_type) {
   base::FundamentalValue state_value(state);
   base::StringValue network_value(network_name);
   base::StringValue reason_value(reason);
   base::FundamentalValue last_network_value(last_network_type);
   web_ui()->CallJavascriptFunction(callback,
       state_value, network_value, reason_value, last_network_value);
 }
 
 }  // namespace chromeos