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

Unified Diff: ash/wm/window_cycle_controller_unittest.cc

Issue 2734933004: ash: Use SessionController instead of SessionStateDelegate (Closed)
Patch Set: rebase to get WorkspaceLayoutManagerSoloTest change Created 3 years, 9 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/wm/power_button_controller.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_cycle_controller_unittest.cc
diff --git a/ash/wm/window_cycle_controller_unittest.cc b/ash/wm/window_cycle_controller_unittest.cc
index d74909fa8e8b2efabf8c22ec43ae9c86bfeeb550..72af2535a464f93f58cb23a02fe270dcd913f5d0 100644
--- a/ash/wm/window_cycle_controller_unittest.cc
+++ b/ash/wm/window_cycle_controller_unittest.cc
@@ -9,9 +9,10 @@
#include "ash/common/focus_cycler.h"
#include "ash/common/scoped_root_window_for_new_windows.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/shelf/shelf_widget.h"
#include "ash/common/shelf/wm_shelf.h"
+#include "ash/common/test/test_session_controller_client.h"
#include "ash/common/test/test_shelf_delegate.h"
#include "ash/common/wm/window_cycle_list.h"
#include "ash/common/wm/window_state.h"
@@ -226,13 +227,13 @@ TEST_F(WindowCycleControllerTest, HandleCycleWindow) {
wm::ActivateWindow(window0.get());
// When the screen is locked, cycling window does not take effect.
- WmShell::Get()->GetSessionStateDelegate()->LockScreen();
+ WmShell::Get()->session_controller()->LockScreenAndFlushForTest();
EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
controller->HandleCycleWindow(WindowCycleController::FORWARD);
EXPECT_FALSE(controller->IsCycling());
// Unlock, it works again.
- WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
+ GetSessionControllerClient()->UnlockScreen();
EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
controller->HandleCycleWindow(WindowCycleController::FORWARD);
controller->HandleCycleWindow(WindowCycleController::FORWARD);
« no previous file with comments | « ash/wm/power_button_controller.cc ('k') | chrome/browser/chromeos/login/lock/screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698