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

Unified Diff: trunk/src/ash/test/ash_test_base.cc

Issue 14200034: Revert 194578 "Add ash SessionStateDelegate" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
Index: trunk/src/ash/test/ash_test_base.cc
===================================================================
--- trunk/src/ash/test/ash_test_base.cc (revision 194588)
+++ trunk/src/ash/test/ash_test_base.cc (working copy)
@@ -14,7 +14,6 @@
#include "ash/shell.h"
#include "ash/test/display_manager_test_api.h"
#include "ash/test/shell_test_api.h"
-#include "ash/test/test_session_state_delegate.h"
#include "ash/test/test_shell_delegate.h"
#include "ash/wm/coordinate_conversion.h"
#include "base/command_line.h"
@@ -276,18 +275,15 @@
}
void AshTestBase::SetSessionStarted(bool session_started) {
- test_shell_delegate_->test_session_state_delegate()->
- SetActiveUserSessionStarted(session_started);
+ test_shell_delegate_->SetSessionStarted(session_started);
}
void AshTestBase::SetUserLoggedIn(bool user_logged_in) {
- test_shell_delegate_->test_session_state_delegate()->
- SetHasActiveUser(user_logged_in);
+ test_shell_delegate_->SetUserLoggedIn(user_logged_in);
}
void AshTestBase::SetCanLockScreen(bool can_lock_screen) {
- test_shell_delegate_->test_session_state_delegate()->
- SetCanLockScreen(can_lock_screen);
+ test_shell_delegate_->SetCanLockScreen(can_lock_screen);
}
} // namespace test
Property changes on: trunk/src/ash/test/ash_test_base.cc
___________________________________________________________________
Deleted: svn:mergeinfo
« no previous file with comments | « trunk/src/ash/system/tray/test_system_tray_delegate.cc ('k') | trunk/src/ash/test/test_session_state_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698