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

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

Issue 2861243003: chromeos: Converts WorkspaceLayoutManager to aura::LayoutManager (Closed)
Patch Set: feedback Created 3 years, 7 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/workspace/workspace_layout_manager_keyboard_unittest.cc ('k') | ash/wm/workspace_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/workspace_layout_manager_unittest.cc
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc
index e6309ef4be672bafe0a9703a6ac7110cc9fc42b6..5ef8fe99d7b78012986b67cb051f4a26b1ca65db 100644
--- a/ash/wm/workspace/workspace_layout_manager_unittest.cc
+++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -730,8 +730,7 @@ TEST_F(WorkspaceLayoutManagerSoloTest, FullscreenSuspendsAlwaysOnTop) {
always_on_top_window1->GetProperty(aura::client::kAlwaysOnTopKey));
EXPECT_FALSE(
always_on_top_window2->GetProperty(aura::client::kAlwaysOnTopKey));
- EXPECT_NE(nullptr, wm::GetWindowForFullscreenMode(
- WmWindow::Get(fullscreen_window.get())));
+ EXPECT_NE(nullptr, wm::GetWindowForFullscreenMode(fullscreen_window.get()));
// Adding a new always-on-top window is not affected by fullscreen.
std::unique_ptr<aura::Window> always_on_top_window3(
@@ -749,8 +748,7 @@ TEST_F(WorkspaceLayoutManagerSoloTest, FullscreenSuspendsAlwaysOnTop) {
always_on_top_window2->GetProperty(aura::client::kAlwaysOnTopKey));
EXPECT_TRUE(
always_on_top_window3->GetProperty(aura::client::kAlwaysOnTopKey));
- EXPECT_EQ(nullptr, wm::GetWindowForFullscreenMode(
- WmWindow::Get(fullscreen_window.get())));
+ EXPECT_EQ(nullptr, wm::GetWindowForFullscreenMode(fullscreen_window.get()));
}
// Similary, pinned window causes always_on_top_ windows to stack below.
@@ -933,8 +931,7 @@ TEST_F(WorkspaceLayoutManagerSoloTest, NotResizeWhenScreenIsLocked) {
namespace {
WorkspaceLayoutManager* GetWorkspaceLayoutManager(aura::Window* container) {
- return static_cast<WorkspaceLayoutManager*>(
- WmWindow::Get(container)->GetLayoutManager());
+ return static_cast<WorkspaceLayoutManager*>(container->layout_manager());
}
class WorkspaceLayoutManagerBackdropTest : public test::AshTestBase {
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc ('k') | ash/wm/workspace_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698