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

Unified Diff: ash/common/shelf/shelf_window_watcher_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
Index: ash/common/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/common/shelf/shelf_window_watcher_unittest.cc b/ash/common/shelf/shelf_window_watcher_unittest.cc
index 79b41b84d4d7fd369da49cc4c1f40c8d7fefe3d3..a3232c0b141978578e0e3806036d0bf91910666e 100644
--- a/ash/common/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/common/shelf/shelf_window_watcher_unittest.cc
@@ -4,7 +4,7 @@
#include "ash/common/shelf/shelf_window_watcher.h"
-#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/session/session_controller.h"
#include "ash/common/shelf/shelf_model.h"
#include "ash/common/wm/window_resizer.h"
#include "ash/common/wm/window_state.h"
@@ -377,7 +377,7 @@ using ShelfWindowWatcherSessionStartTest = test::NoSessionAshTestBase;
TEST_F(ShelfWindowWatcherSessionStartTest, PreExistingWindow) {
ShelfModel* model = WmShell::Get()->shelf_model();
ASSERT_FALSE(
- WmShell::Get()->GetSessionStateDelegate()->IsActiveUserSessionStarted());
+ WmShell::Get()->session_controller()->IsActiveUserSessionStarted());
// ShelfModel only has an APP_LIST item.
EXPECT_EQ(1, model->item_count());
« no previous file with comments | « ash/common/shelf/shelf_widget.cc ('k') | ash/common/system/chromeos/media_security/multi_profile_media_tray_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698