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

Unified Diff: ash/common/test/test_system_tray_delegate.cc

Issue 2420783002: mustash: Convert TraySupervisedUserTest to AshTest (Closed)
Patch Set: rebase Created 4 years, 2 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/common/test/test_system_tray_delegate.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/test/test_system_tray_delegate.cc
diff --git a/ash/common/test/test_system_tray_delegate.cc b/ash/common/test/test_system_tray_delegate.cc
index a40c227789b65d66b6c76f8ba5b8b14b75730a27..9e4bf2c3a917e45d904fc0b8316de95399d4c5d7 100644
--- a/ash/common/test/test_system_tray_delegate.cc
+++ b/ash/common/test/test_system_tray_delegate.cc
@@ -28,11 +28,6 @@ TestSystemTrayDelegate::TestSystemTrayDelegate()
TestSystemTrayDelegate::~TestSystemTrayDelegate() {}
// static
-void TestSystemTrayDelegate::SetInitialLoginStatus(LoginStatus login_status) {
- g_initial_status = login_status;
-}
-
-// static
void TestSystemTrayDelegate::SetSystemUpdateRequired(bool required) {
g_system_update_required = required;
}
@@ -117,5 +112,16 @@ void TestSystemTrayDelegate::GetAvailableIMEList(IMEInfoList* list) {
*list = ime_list_;
}
+////////////////////////////////////////////////////////////////////////////////
+
+ScopedInitialLoginStatus::ScopedInitialLoginStatus(LoginStatus new_status)
+ : old_status_(g_initial_status) {
+ g_initial_status = new_status;
+}
+
+ScopedInitialLoginStatus::~ScopedInitialLoginStatus() {
+ g_initial_status = old_status_;
+}
+
} // namespace test
} // namespace ash
« no previous file with comments | « ash/common/test/test_system_tray_delegate.h ('k') | ash/test/ash_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698