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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback 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
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5fd1cba176100451c0e3544524d7a5d467e465ec..55887189033e386fd9179b28d219a9cd404afbb0 100644
--- a/ash/system/chromeos/session/tray_session_length_limit.cc
+++ b/ash/system/chromeos/session/tray_session_length_limit.cc
@@ -9,6 +9,7 @@
#include <utility>
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/chromeos/label_tray_view.h"
#include "ash/system/system_notifier.h"
@@ -91,7 +92,7 @@ void TraySessionLengthLimit::Update() {
}
void TraySessionLengthLimit::UpdateState() {
- SystemTrayDelegate* delegate = Shell::GetInstance()->system_tray_delegate();
+ SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
if (delegate->GetSessionStartTime(&session_start_time_) &&
delegate->GetSessionLengthLimit(&time_limit_)) {
const base::TimeDelta expiring_soon_threshold(
« ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('K') | « ash/system/chromeos/session/logout_button_tray.cc ('k') | ash/system/chromeos/settings/tray_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698