Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3535)

Unified Diff: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 8537001: chromeos: Power manager client calls shutdown and restart (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: removed DCHECK for power library Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
index 6c62afa4a8c1bbd68652fce0e78d3e4af49ce7ca..2c94d3a73a90ef84917f9b2f4f31dc2dd648f4df 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc
@@ -15,7 +15,8 @@
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chrome/browser/chromeos/cros/power_library.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
#include "chrome/browser/chromeos/login/screen_locker.h"
@@ -542,8 +543,7 @@ void SigninScreenHandler::HandleFixCaptivePortal(const base::ListValue* args) {
}
void SigninScreenHandler::HandleShutdownSystem(const base::ListValue* args) {
- DCHECK(CrosLibrary::Get()->EnsureLoaded());
- CrosLibrary::Get()->GetPowerLibrary()->RequestShutdown();
+ DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
}
void SigninScreenHandler::HandleRemoveUser(const base::ListValue* args) {

Powered by Google App Engine
This is Rietveld 408576698