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

Unified Diff: ash/wm/dock/docked_window_layout_manager_unittest.cc

Issue 2622053004: ash: Restore previous show state after exiting fullscreen. (Closed)
Patch Set: Rebase Created 3 years, 11 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/mus/top_level_window_factory_unittest.cc ('k') | ash/wm/screen_pinning_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/dock/docked_window_layout_manager_unittest.cc
diff --git a/ash/wm/dock/docked_window_layout_manager_unittest.cc b/ash/wm/dock/docked_window_layout_manager_unittest.cc
index 3523b340d50fd7600fd9add796f7f2407c22df73..d3c24f9c189d436a9e941b473849781847609e5c 100644
--- a/ash/wm/dock/docked_window_layout_manager_unittest.cc
+++ b/ash/wm/dock/docked_window_layout_manager_unittest.cc
@@ -683,7 +683,7 @@ TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsMinimize) {
EXPECT_EQ(ui::SHOW_STATE_MINIMIZED,
w1->GetProperty(aura::client::kShowStateKey));
EXPECT_EQ(ui::SHOW_STATE_DOCKED,
- w1->GetProperty(aura::client::kRestoreShowStateKey));
+ w1->GetProperty(aura::client::kPreMinimizedShowStateKey));
// The other two windows should be still docked.
EXPECT_FALSE(wm::GetWindowState(w2.get())->IsMinimized());
EXPECT_TRUE(wm::GetWindowState(w2.get())->IsDocked());
« no previous file with comments | « ash/mus/top_level_window_factory_unittest.cc ('k') | ash/wm/screen_pinning_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698