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

Unified Diff: ash/mus/workspace/workspace_layout_manager_unittest.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 4 years, 6 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/mus/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/mus/workspace/workspace_layout_manager_unittest.cc b/ash/mus/workspace/workspace_layout_manager_unittest.cc
index 5af3e54acd724310b32082d49bbe4f5dab1f070e..8fd69f3c9f57f41ba63ff8945ee59ffd5ede6c39 100644
--- a/ash/mus/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/mus/workspace/workspace_layout_manager_unittest.cc
@@ -747,12 +747,12 @@ TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) {
window_bounds.ToString());
// The window size should not get touched while we are in lock screen.
- Shell::GetInstance()->session_state_delegate()->LockScreen();
+ WmShell::Get()->GetSessionStateDelegate()->LockScreen();
shelf_layout_manager->UpdateVisibilityState();
EXPECT_EQ(window_bounds.ToString(), window->bounds().ToString());
// Coming out of the lock screen the window size should still remain.
- Shell::GetInstance()->session_state_delegate()->UnlockScreen();
+ WmShell::Get()->GetSessionStateDelegate()->UnlockScreen();
shelf_layout_manager->UpdateVisibilityState();
EXPECT_EQ(
ScreenUtil::GetMaximizedWindowBoundsInParent(window.get()).ToString(),
@@ -791,10 +791,9 @@ class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase {
// Turn the top window back drop on / off.
void ShowTopWindowBackdrop(bool show) {
- std::unique_ptr<ash::WorkspaceLayoutManagerBackdropDelegate> backdrop;
- if (show) {
- backdrop.reset(new ash::WorkspaceBackdropDelegate(default_container_));
- }
+ std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> backdrop;
+ if (show)
+ backdrop.reset(new WorkspaceBackdropDelegate(default_container_));
GetWorkspaceLayoutManager(default_container_)
->SetMaximizeBackdropDelegate(std::move(backdrop));
// Closing and / or opening can be a delayed operation.

Powered by Google App Engine
This is Rietveld 408576698