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

Unified Diff: ash/common/system/chromeos/session/logout_button_tray.cc

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: merge 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
Index: ash/common/system/chromeos/session/logout_button_tray.cc
diff --git a/ash/common/system/chromeos/session/logout_button_tray.cc b/ash/common/system/chromeos/session/logout_button_tray.cc
index c34a7a35d0fb49cc533030208c3204178ed6fe4d..25bf4626a96442bae5638990a8f31eaf3c4bfd67 100644
--- a/ash/common/system/chromeos/session/logout_button_tray.cc
+++ b/ash/common/system/chromeos/session/logout_button_tray.cc
@@ -18,6 +18,7 @@
#include "ash/public/cpp/shelf_types.h"
#include "ash/resources/grit/ash_resources.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
#include "base/logging.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/events/event.h"
@@ -84,9 +85,9 @@ void LogoutButtonTray::ButtonPressed(views::Button* sender,
if (dialog_duration_ <= base::TimeDelta()) {
// Sign out immediately if |dialog_duration_| is non-positive.
- WmShell::Get()->system_tray_controller()->SignOut();
- } else if (WmShell::Get()->logout_confirmation_controller()) {
- WmShell::Get()->logout_confirmation_controller()->ConfirmLogout(
+ Shell::Get()->system_tray_controller()->SignOut();
+ } else if (Shell::Get()->logout_confirmation_controller()) {
+ Shell::Get()->logout_confirmation_controller()->ConfirmLogout(
base::TimeTicks::Now() + dialog_duration_);
}
}

Powered by Google App Engine
This is Rietveld 408576698