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

Unified Diff: ash/test/test_system_tray_delegate.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/test/test_system_tray_delegate.h ('k') | ash/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/test_system_tray_delegate.cc
diff --git a/ash/test/test_system_tray_delegate.cc b/ash/test/test_system_tray_delegate.cc
index d3ea55ca56b8062ecc28846f7022f14b73b608b0..9e47cc9eebc9bcdf70d9b9b74ebf17a703bd027e 100644
--- a/ash/test/test_system_tray_delegate.cc
+++ b/ash/test/test_system_tray_delegate.cc
@@ -6,8 +6,6 @@
#include <string>
-#include "ash/login_status.h"
-#include "ash/session/session_controller.h"
#include "ash/shell.h"
#include "base/time/time.h"
@@ -36,10 +34,6 @@ void TestSystemTrayDelegate::SetAvailableIMEList(const IMEInfoList& list) {
ime_list_ = list;
}
-LoginStatus TestSystemTrayDelegate::GetUserLoginStatus() const {
- return Shell::Get()->session_controller()->login_status();
-}
-
bool TestSystemTrayDelegate::GetSessionStartTime(
base::TimeTicks* session_start_time) {
// Just returns TimeTicks::Now(), so the remaining time is always the
« no previous file with comments | « ash/test/test_system_tray_delegate.h ('k') | ash/wm/maximize_mode/maximize_mode_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698