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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/date/tray_date.cc

Issue 14295008: Add ash SessionStateDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ready for review. Created 7 years, 8 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/session_state_delegate.h ('K') | « ash/shell_unittest.cc ('k') | ash/system/tray/test_system_tray_delegate.cc » ('j') | ash/test/test_session_state_delegate.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.cc
diff --git a/ash/system/date/tray_date.cc b/ash/system/date/tray_date.cc
index fb1fffb5557caa96166bab3ee0c96c6bb2a6b0d5..34edabbe869188f84f3b28a019da9e9db8c1d68f 100644
--- a/ash/system/date/tray_date.cc
+++ b/ash/system/date/tray_date.cc
@@ -4,6 +4,7 @@
#include "ash/system/date/tray_date.h"
+#include "ash/session_state_delegate.h"
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/system/date/date_view.h"
@@ -89,7 +90,7 @@ class DateDefaultView : public views::View,
view->AddButton(shutdown_);
}
- if (ash::Shell::GetInstance()->CanLockScreen()) {
+ if (ash::Shell::GetInstance()->session_state_delegate()->CanLockScreen()) {
lock_ = new ash::internal::TrayPopupHeaderButton(this,
IDR_AURA_UBER_TRAY_LOCKSCREEN,
IDR_AURA_UBER_TRAY_LOCKSCREEN,
« ash/session_state_delegate.h ('K') | « ash/shell_unittest.cc ('k') | ash/system/tray/test_system_tray_delegate.cc » ('j') | ash/test/test_session_state_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698