diff options
| -rw-r--r-- | ash/wm/base_layout_manager.cc | 1 | ||||
| -rw-r--r-- | ash/wm/workspace/workspace_manager_unittest.cc | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ash/wm/base_layout_manager.cc b/ash/wm/base_layout_manager.cc index 81163dd..d7d948f 100644 --- a/ash/wm/base_layout_manager.cc +++ b/ash/wm/base_layout_manager.cc @@ -95,6 +95,7 @@ void BaseLayoutManager::OnWindowPropertyChanged(aura::Window* window, void BaseLayoutManager::UpdateBoundsFromShowState(aura::Window* window) { switch (window->GetProperty(aura::client::kShowStateKey)) { + case ui::SHOW_STATE_DEFAULT: case ui::SHOW_STATE_NORMAL: { const gfx::Rect* restore = GetRestoreBounds(window); if (restore) diff --git a/ash/wm/workspace/workspace_manager_unittest.cc b/ash/wm/workspace/workspace_manager_unittest.cc index 12fd5af..0bec41d 100644 --- a/ash/wm/workspace/workspace_manager_unittest.cc +++ b/ash/wm/workspace/workspace_manager_unittest.cc @@ -370,8 +370,10 @@ TEST_F(WorkspaceManagerTest, SingleFullscreenWindow) { EXPECT_EQ(GetFullscreenBounds(w1.get()).width(), w1->bounds().width()); EXPECT_EQ(GetFullscreenBounds(w1.get()).height(), w1->bounds().height()); - // Restore the window. - w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); + // Restore the window. Use SHOW_STATE_DEFAULT as that is what we'll end up + // with when using views::Widget. + w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DEFAULT); + EXPECT_EQ("0,0 250x251", w1->bounds().ToString()); // Should be 1 workspace, TYPE_NORMAL with w1. ASSERT_EQ(1u, workspaces().size()); |