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

Unified Diff: ash/common/shutdown_controller.cc

Issue 2741273002: chromeos: Promotes more from WmShell to Shell (Closed)
Patch Set: feedback Created 3 years, 9 months 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
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shutdown_controller.cc
diff --git a/ash/common/shutdown_controller.cc b/ash/common/shutdown_controller.cc
index b40fe8626152d55caa874aefca83199e8a9b8c8e..98c3dae6dfd4dd21aa43d8341ded13e29ee550d9 100644
--- a/ash/common/shutdown_controller.cc
+++ b/ash/common/shutdown_controller.cc
@@ -5,7 +5,7 @@
#include "ash/common/shutdown_controller.h"
#include "ash/common/shell_delegate.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
#include "base/sys_info.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
@@ -19,7 +19,7 @@ ShutdownController::~ShutdownController() {}
void ShutdownController::ShutDownOrReboot() {
// For developers on Linux desktop just exit the app.
if (!base::SysInfo::IsRunningOnChromeOS()) {
- WmShell::Get()->delegate()->Exit();
+ Shell::Get()->shell_delegate()->Exit();
return;
}
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698