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

Unified Diff: ash/system/chromeos/session/last_window_closed_logout_reminder.cc

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 6 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/system/chromeos/session/last_window_closed_logout_reminder.cc
diff --git a/ash/system/chromeos/session/last_window_closed_logout_reminder.cc b/ash/system/chromeos/session/last_window_closed_logout_reminder.cc
index 002c7d4152f04b5237081fd6f9edda63d85a4697..f2cd5e64be3819c296b73e5a75e14ad28150c3e6 100644
--- a/ash/system/chromeos/session/last_window_closed_logout_reminder.cc
+++ b/ash/system/chromeos/session/last_window_closed_logout_reminder.cc
@@ -6,10 +6,10 @@
#include "ash/common/login_status.h"
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/chromeos/session/logout_confirmation_controller.h"
-#include "ash/system/tray/system_tray_notifier.h"
#include "base/time/time.h"
namespace ash {
@@ -18,13 +18,11 @@ const int kLogoutConfirmationDelayInSeconds = 20;
}
LastWindowClosedLogoutReminder::LastWindowClosedLogoutReminder() {
- Shell::GetInstance()->system_tray_notifier()->AddLastWindowClosedObserver(
- this);
+ WmShell::Get()->system_tray_notifier()->AddLastWindowClosedObserver(this);
}
LastWindowClosedLogoutReminder::~LastWindowClosedLogoutReminder() {
- Shell::GetInstance()->system_tray_notifier()->RemoveLastWindowClosedObserver(
- this);
+ WmShell::Get()->system_tray_notifier()->RemoveLastWindowClosedObserver(this);
}
void LastWindowClosedLogoutReminder::OnLastWindowClosed() {

Powered by Google App Engine
This is Rietveld 408576698