Improving window auto management between workspaces

chrome/browser/sessions/session_service_unittest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
@@ skipping 39 matching lines @@
     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, SessionService::TYPE_NORMAL);
     service()->SetWindowBounds(window_id,
                                window_bounds,
-                               ui::SHOW_STATE_NORMAL);
+                               ui::SHOW_STATE_NORMAL,
+                               false);
   }
 
   // Upon notification, increment the sync_save_count variable
   void Observe(int type,
                const content::NotificationSource& source,
                const content::NotificationDetails& details) {
     ASSERT_EQ(type, chrome::NOTIFICATION_SESSION_SERVICE_SAVED);
     sync_save_count_++;
   }
 
@@ skipping 71 matching lines @@
         SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
 
     helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
     UpdateNavigation(window_id, tab1_id, *nav1, true);
 
     const gfx::Rect window2_bounds(3, 4, 5, 6);
     service()->SetWindowType(
         window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
     service()->SetWindowBounds(window2_id,
                                window2_bounds,
-                               ui::SHOW_STATE_MAXIMIZED);
+                               ui::SHOW_STATE_MAXIMIZED,
+                               false);
     helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
     UpdateNavigation(window2_id, tab2_id, *nav2, true);
 
   }
 
   SessionService* service() { return helper_.service(); }
 
   SessionBackend* backend() { return helper_.backend(); }
 
   const gfx::Rect window_bounds;
@@ skipping 173 matching lines @@
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
 
   helper_.PrepareTabInWindow(window_id, tab1_id, 0, true);
   UpdateNavigation(window_id, tab1_id, nav1, true);
 
   const gfx::Rect window2_bounds(3, 4, 5, 6);
   service()->SetWindowType(
       window2_id, Browser::TYPE_TABBED, SessionService::TYPE_NORMAL);
   service()->SetWindowBounds(window2_id,
                              window2_bounds,
-                             ui::SHOW_STATE_NORMAL);
+                             ui::SHOW_STATE_NORMAL,
+                             false);
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, true);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()), NULL);
 
   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 40 matching lines @@
 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, SessionService::TYPE_NORMAL);
   service()->SetWindowBounds(window2_id,
                              window_bounds,
-                             ui::SHOW_STATE_NORMAL);
+                             ui::SHOW_STATE_NORMAL,
+                             false);
 
   TabNavigation nav1 =
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
   TabNavigation nav2 =
       SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, true);
 
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
@@ skipping 23 matching lines @@
 
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(
       window2_id, Browser::TYPE_POPUP, SessionService::TYPE_NORMAL);
   service()->SetWindowBounds(window2_id,
                              window_bounds,
-                             ui::SHOW_STATE_NORMAL);
+                             ui::SHOW_STATE_NORMAL,
+                             false);
 
   TabNavigation nav1 =
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
   TabNavigation nav2 =
       SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, true);
 
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
@@ skipping 19 matching lines @@
 
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(
       window2_id, Browser::TYPE_POPUP, SessionService::TYPE_NORMAL);
   service()->SetWindowBounds(window2_id,
                              window_bounds,
-                             ui::SHOW_STATE_NORMAL);
+                             ui::SHOW_STATE_NORMAL,
+                             false);
 
   TabNavigation nav1 =
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
   TabNavigation nav2 =
       SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, true);
 
   helper_.PrepareTabInWindow(window2_id, tab2_id, 0, false);
@@ skipping 28 matching lines @@
 TEST_F(SessionServiceTest, RestoreApp) {
   SessionID window2_id;
   SessionID tab_id;
   SessionID tab2_id;
   ASSERT_NE(window2_id.id(), window_id.id());
 
   service()->SetWindowType(
       window2_id, Browser::TYPE_POPUP, SessionService::TYPE_APP);
   service()->SetWindowBounds(window2_id,
                              window_bounds,
-                             ui::SHOW_STATE_NORMAL);
+                             ui::SHOW_STATE_NORMAL,
+                             false);
   service()->SetWindowAppName(window2_id, "TestApp");
 
   TabNavigation nav1 =
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
   TabNavigation nav2 =
       SessionTypesTestHelper::CreateNavigation("http://google2.com", "abcd");
 
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, true);
 
@@ skipping 187 matching lines @@
 // Verifies SetWindowBounds maps SHOW_STATE_DEFAULT to SHOW_STATE_NORMAL.
 TEST_F(SessionServiceTest, DontPersistDefault) {
   SessionID tab_id;
   ASSERT_NE(window_id.id(), tab_id.id());
   TabNavigation nav1 =
       SessionTypesTestHelper::CreateNavigation("http://google.com", "abc");
   helper_.PrepareTabInWindow(window_id, tab_id, 0, true);
   UpdateNavigation(window_id, tab_id, nav1, true);
   service()->SetWindowBounds(window_id,
                              window_bounds,
-                             ui::SHOW_STATE_DEFAULT);
+                             ui::SHOW_STATE_DEFAULT,
+                             false);
 
   ScopedVector<SessionWindow> windows;
   ReadWindows(&(windows.get()), NULL);
   ASSERT_EQ(1U, windows.size());
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, windows[0]->show_state);
 }
 
 TEST_F(SessionServiceTest, KeepPostDataWithoutPasswords) {
   SessionID tab_id;
   ASSERT_NE(window_id.id(), tab_id.id());
@@ skipping 207 matching lines @@
   service()->ScheduleCommand(
       service()->CreateSetActiveWindowCommand(window_id));
   service()->ScheduleCommand(
       service()->CreateSetActiveWindowCommand(window2_id));
 
   ScopedVector<SessionWindow> windows;
   SessionID::id_type active_window_id = 0;
   ReadWindows(&(windows.get()), &active_window_id);
   EXPECT_EQ(window2_id.id(), active_window_id);
 }