OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/process/launch.h" | 9 #include "base/process/launch.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
13 #include "chrome/browser/chrome_notification_types.h" | 13 #include "chrome/browser/chrome_notification_types.h" |
14 #include "chrome/browser/defaults.h" | 14 #include "chrome/browser/defaults.h" |
15 #include "chrome/browser/first_run/first_run.h" | 15 #include "chrome/browser/first_run/first_run.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
| 18 #include "chrome/browser/search/search.h" |
18 #include "chrome/browser/sessions/session_restore.h" | 19 #include "chrome/browser/sessions/session_restore.h" |
19 #include "chrome/browser/sessions/session_service.h" | 20 #include "chrome/browser/sessions/session_service.h" |
20 #include "chrome/browser/sessions/session_service_factory.h" | 21 #include "chrome/browser/sessions/session_service_factory.h" |
21 #include "chrome/browser/sessions/session_service_test_helper.h" | 22 #include "chrome/browser/sessions/session_service_test_helper.h" |
22 #include "chrome/browser/sessions/session_types.h" | 23 #include "chrome/browser/sessions/session_types.h" |
23 #include "chrome/browser/sessions/tab_restore_service.h" | 24 #include "chrome/browser/sessions/tab_restore_service.h" |
24 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 25 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
25 #include "chrome/browser/ui/browser.h" | 26 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/browser/ui/browser_commands.h" | 27 #include "chrome/browser/ui/browser_commands.h" |
27 #include "chrome/browser/ui/browser_list.h" | 28 #include "chrome/browser/ui/browser_list.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 // open. | 213 // open. |
213 CloseBrowserSynchronously(browser()); | 214 CloseBrowserSynchronously(browser()); |
214 | 215 |
215 // Create a new window, which should open NTP. | 216 // Create a new window, which should open NTP. |
216 ui_test_utils::BrowserAddedObserver browser_added_observer; | 217 ui_test_utils::BrowserAddedObserver browser_added_observer; |
217 chrome::NewWindow(incognito_browser); | 218 chrome::NewWindow(incognito_browser); |
218 Browser* new_browser = browser_added_observer.WaitForSingleNewBrowser(); | 219 Browser* new_browser = browser_added_observer.WaitForSingleNewBrowser(); |
219 | 220 |
220 ASSERT_TRUE(new_browser); | 221 ASSERT_TRUE(new_browser); |
221 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); | 222 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); |
222 EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), | 223 EXPECT_TRUE(chrome::IsNTPURL( |
223 new_browser->tab_strip_model()->GetWebContentsAt(0)->GetURL()); | 224 new_browser->tab_strip_model()->GetWebContentsAt(0)->GetURL(), |
| 225 new_browser->profile())); |
224 } | 226 } |
225 | 227 |
226 // Test that maximized applications get restored maximized. | 228 // Test that maximized applications get restored maximized. |
227 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MaximizedApps) { | 229 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, MaximizedApps) { |
228 const char* app_name = "TestApp"; | 230 const char* app_name = "TestApp"; |
229 Browser* app_browser = CreateBrowserForApp(app_name, browser()->profile()); | 231 Browser* app_browser = CreateBrowserForApp(app_name, browser()->profile()); |
230 app_browser->window()->Maximize(); | 232 app_browser->window()->Maximize(); |
231 app_browser->window()->Show(); | 233 app_browser->window()->Show(); |
232 EXPECT_TRUE(app_browser->window()->IsMaximized()); | 234 EXPECT_TRUE(app_browser->window()->IsMaximized()); |
233 EXPECT_TRUE(app_browser->is_app()); | 235 EXPECT_TRUE(app_browser->is_app()); |
(...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1148 content::NavigationController* controller = | 1150 content::NavigationController* controller = |
1149 &browser()->tab_strip_model()->GetActiveWebContents()->GetController(); | 1151 &browser()->tab_strip_model()->GetActiveWebContents()->GetController(); |
1150 EXPECT_TRUE( | 1152 EXPECT_TRUE( |
1151 controller->GetDefaultSessionStorageNamespace()->should_persist()); | 1153 controller->GetDefaultSessionStorageNamespace()->should_persist()); |
1152 | 1154 |
1153 // Quit and restore. Check that no extra tabs were created. | 1155 // Quit and restore. Check that no extra tabs were created. |
1154 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); | 1156 Browser* new_browser = QuitBrowserAndRestore(browser(), 1); |
1155 ASSERT_EQ(1u, active_browser_list_->size()); | 1157 ASSERT_EQ(1u, active_browser_list_->size()); |
1156 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); | 1158 EXPECT_EQ(1, new_browser->tab_strip_model()->count()); |
1157 } | 1159 } |
OLD | NEW |