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

Unified Diff: ash/mus/system_tray_delegate_mus.cc

Issue 2864663002: cros: Merge SystemTrayDelegate::GetUserLoginStatus (Closed)
Patch Set: update PaletteTray to exclude ARC kiosk Created 3 years, 7 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
« no previous file with comments | « ash/mus/system_tray_delegate_mus.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/system_tray_delegate_mus.cc
diff --git a/ash/mus/system_tray_delegate_mus.cc b/ash/mus/system_tray_delegate_mus.cc
index dc4a1dc17ab5302a375271cf753b273758beca0a..5093f3cf18c28b95611275489a4e9e9f72186d3c 100644
--- a/ash/mus/system_tray_delegate_mus.cc
+++ b/ash/mus/system_tray_delegate_mus.cc
@@ -4,8 +4,6 @@
#include "ash/mus/system_tray_delegate_mus.h"
-#include "ash/session/session_controller.h"
-#include "ash/shell.h"
#include "ash/system/networking_config_delegate.h"
namespace ash {
@@ -36,10 +34,6 @@ SystemTrayDelegateMus::SystemTrayDelegateMus()
SystemTrayDelegateMus::~SystemTrayDelegateMus() {
}
-LoginStatus SystemTrayDelegateMus::GetUserLoginStatus() const {
- return Shell::Get()->session_controller()->login_status();
-}
-
NetworkingConfigDelegate* SystemTrayDelegateMus::GetNetworkingConfigDelegate()
const {
return networking_config_delegate_.get();
« no previous file with comments | « ash/mus/system_tray_delegate_mus.h ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698