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

Unified Diff: ash/system/chromeos/session/tray_session_length_limit.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/tray_session_length_limit.cc
diff --git a/ash/system/chromeos/session/tray_session_length_limit.cc b/ash/system/chromeos/session/tray_session_length_limit.cc
index 0dec0563c5673cfb13392713da3b38da0852d202..01145c086c45d8070a71d9058d8f60af9719d466 100644
--- a/ash/system/chromeos/session/tray_session_length_limit.cc
+++ b/ash/system/chromeos/session/tray_session_length_limit.cc
@@ -10,11 +10,10 @@
#include "ash/common/system/system_notifier.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/label_tray_view.h"
#include "ash/system/tray/system_tray.h"
-#include "ash/system/tray/system_tray_notifier.h"
#include "base/logging.h"
#include "base/strings/utf_string_conversions.h"
#include "grit/ash_resources.h"
@@ -49,14 +48,13 @@ TraySessionLengthLimit::TraySessionLengthLimit(SystemTray* system_tray)
limit_state_(LIMIT_NONE),
last_limit_state_(LIMIT_NONE),
tray_bubble_view_(NULL) {
- Shell::GetInstance()->system_tray_notifier()->
- AddSessionLengthLimitObserver(this);
+ WmShell::Get()->system_tray_notifier()->AddSessionLengthLimitObserver(this);
Update();
}
TraySessionLengthLimit::~TraySessionLengthLimit() {
- Shell::GetInstance()->system_tray_notifier()->
- RemoveSessionLengthLimitObserver(this);
+ WmShell::Get()->system_tray_notifier()->RemoveSessionLengthLimitObserver(
+ this);
}
// Add view to tray bubble.

Powered by Google App Engine
This is Rietveld 408576698