Restoring a session should restore window minimization state

chrome/browser/sessions/session_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/stl_util.h"
@@ skipping 27 matching lines @@
 
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     path_ = temp_dir_.path().Append(FILE_PATH_LITERAL("SessionTestDirs"));
     ASSERT_TRUE(file_util::CreateDirectory(path_));
     path_ = path_.AppendASCII(b);
 
     SessionService* session_service = new SessionService(path_);
     helper_.set_service(session_service);
 
     service()->SetWindowType(window_id, Browser::TYPE_TABBED);
-    service()->SetWindowBounds(window_id, window_bounds, false);
+    service()->SetWindowBounds(window_id,
+                               window_bounds,
+                               ui::SHOW_STATE_NORMAL);
   }
 
   // Upon notification, increment the sync_save_count variable
   void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details) {
     ASSERT_EQ(type, chrome::NOTIFICATION_SESSION_SERVICE_SAVED);
     sync_save_count_++;
   }
 
@@ skipping 202 matching lines @@
                      PageTransition::QUALIFIER_MASK);
   TabNavigation nav2(0, GURL("http://google2.com"), GURL(),
                      ASCIIToUTF16("abcd"), "defg",
                      PageTransition::AUTO_BOOKMARK);
 
   helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
   UpdateNavigation(window_id, tab1_id, nav1, 0, true);
 
   const gfx::Rect window2_bounds(3, 4, 5, 6);
   service()->SetWindowType(window2_id, Browser::TYPE_TABBED);
-  service()->SetWindowBounds(window2_id, window2_bounds, true);
+  service()->SetWindowBounds(window2_id,
+                             window2_bounds,
+                             ui::SHOW_STATE_MAXIMIZED);
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
   UpdateNavigation(window2_id, tab2_id, nav2, 0, true);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
 
   ASSERT_EQ(2U, windows->size());
   ASSERT_EQ(0, windows[0]->selected_tab_index);
   ASSERT_EQ(0, windows[1]->selected_tab_index);
   ASSERT_EQ(1U, windows[0]->tabs.size());
   ASSERT_EQ(1U, windows[1]->tabs.size());
 
   SessionTab* rt1;
   SessionTab* rt2;
   if (windows[0]->window_id.id() == window_id.id()) {
     ASSERT_EQ(window2_id.id(), windows[1]->window_id.id());
-    ASSERT_FALSE(windows[0]->is_maximized);
-    ASSERT_TRUE(windows[1]->is_maximized);
+    ASSERT_EQ(ui::SHOW_STATE_NORMAL, windows[0]->show_state);
+    ASSERT_EQ(ui::SHOW_STATE_MAXIMIZED, windows[1]->show_state);
     rt1 = windows[0]->tabs[0];
     rt2 = windows[1]->tabs[0];
   } else {
     ASSERT_EQ(window2_id.id(), windows[0]->window_id.id());
     ASSERT_EQ(window_id.id(), windows[1]->window_id.id());
-    ASSERT_TRUE(windows[0]->is_maximized);
-    ASSERT_FALSE(windows[1]->is_maximized);
+    ASSERT_EQ(ui::SHOW_STATE_MAXIMIZED, windows[0]->show_state);
+    ASSERT_EQ(ui::SHOW_STATE_NORMAL, windows[1]->show_state);
     rt1 = windows[1]->tabs[0];
     rt2 = windows[0]->tabs[0];
   }
   SessionTab* tab = rt1;
   helper_.AssertTabEquals(window_id, tab1_id, 0, 0, 1, *tab);
   helper_.AssertNavigationEquals(nav1, tab->navigations[0]);
 
   tab = rt2;
   helper_.AssertTabEquals(window2_id, tab2_id, 0, 0, 1, *tab);
   helper_.AssertNavigationEquals(nav2, tab->navigations[0]);
 }
 
 TEST_F(SessionServiceTest, WindowWithNoTabsGetsPruned) {
   SessionID window2_id;
   SessionID tab1_id;
   SessionID tab2_id;
 
   TabNavigation nav1(0, GURL("http://google.com"), GURL(),
                      ASCIIToUTF16("abc"), "def",
                      PageTransition::QUALIFIER_MASK);
 
   helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
   UpdateNavigation(window_id, tab1_id, nav1, 0, true);
 
   const gfx::Rect window2_bounds(3, 4, 5, 6);
   service()->SetWindowType(window2_id, Browser::TYPE_TABBED);
-  service()->SetWindowBounds(window2_id, window2_bounds, false);
+  service()->SetWindowBounds(window2_id,
+                             window2_bounds,
+                             ui::SHOW_STATE_NORMAL);
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
 
   ASSERT_EQ(1U, windows->size());
   ASSERT_EQ(0, windows[0]->selected_tab_index);
   ASSERT_EQ(1U, windows[0]->tabs.size());
   ASSERT_EQ(window_id.id(), windows[0]->window_id.id());
 
@@ skipping 39 matching lines @@
   helper_.AssertNavigationEquals(nav2, tab->navigations[0]);
 }
 
 TEST_F(SessionServiceTest, WindowCloseCommittedAfterNavigate) {
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(window2_id, Browser::TYPE_TABBED);
-  service()->SetWindowBounds(window2_id, window_bounds, false);
+  service()->SetWindowBounds(window2_id,
+                             window_bounds,
+                             ui::SHOW_STATE_NORMAL);
 
   TabNavigation nav1(0, GURL("http://google.com"), GURL(),
                      ASCIIToUTF16("abc"), "def",
                      PageTransition::QUALIFIER_MASK);
   TabNavigation nav2(0, GURL("http://google2.com"), GURL(),
                      ASCIIToUTF16("abcd"), "defg",
                      PageTransition::AUTO_BOOKMARK);
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, 0, true);
@@ skipping 22 matching lines @@
 TEST_F(SessionServiceTest, IgnorePopups) {
   if (browser_defaults::kRestorePopups)
     return;  // This test is only applicable if popups aren't restored.
 
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(window2_id, Browser::TYPE_POPUP);
-  service()->SetWindowBounds(window2_id, window_bounds, false);
+  service()->SetWindowBounds(window2_id,
+                             window_bounds,
+                             ui::SHOW_STATE_NORMAL);
 
   TabNavigation nav1(0, GURL("http://google.com"), GURL(),
                      ASCIIToUTF16("abc"), "def",
                      PageTransition::QUALIFIER_MASK);
   TabNavigation nav2(0, GURL("http://google2.com"), GURL(),
                      ASCIIToUTF16("abcd"), "defg",
                      PageTransition::AUTO_BOOKMARK);
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, 0, true);
@@ skipping 18 matching lines @@
 TEST_F(SessionServiceTest, RestorePopup) {
   if (!browser_defaults::kRestorePopups)
     return;  // This test is only applicable if popups are restored.
 
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(window2_id, Browser::TYPE_POPUP);
-  service()->SetWindowBounds(window2_id, window_bounds, false);
+  service()->SetWindowBounds(window2_id,
+                             window_bounds,
+                             ui::SHOW_STATE_NORMAL);
 
   TabNavigation nav1(0, GURL("http://google.com"), GURL(),
                      ASCIIToUTF16("abc"), "def",
                      PageTransition::QUALIFIER_MASK);
   TabNavigation nav2(0, GURL("http://google2.com"), GURL(),
                      ASCIIToUTF16("abcd"), "defg",
                      PageTransition::AUTO_BOOKMARK);
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, 0, true);
@@ skipping 177 matching lines @@
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, 0, true);
   service()->TabClosed(window_id, tab_id, true);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()));
 
   ASSERT_TRUE(windows->empty());
 }