| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chrome_notification_types.h" | 5 #include "chrome/browser/chrome_notification_types.h" |
| 6 #include "chrome/browser/sessions/tab_restore_service.h" | 6 #include "chrome/browser/sessions/tab_restore_service.h" |
| 7 #include "chrome/browser/sessions/tab_restore_service_delegate.h" | 7 #include "chrome/browser/sessions/tab_restore_service_delegate.h" |
| 8 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 8 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 close_observer.Wait(); | 62 close_observer.Wait(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { | 65 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, RecentTabsMenuTabDisposition) { |
| 66 // Create tabs. | 66 // Create tabs. |
| 67 CreateTestTabs(browser()); | 67 CreateTestTabs(browser()); |
| 68 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 68 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
| 69 | 69 |
| 70 // Create a new browser. | 70 // Create a new browser. |
| 71 ui_test_utils::NavigateToURLWithDisposition( | 71 ui_test_utils::NavigateToURLWithDisposition( |
| 72 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, | 72 browser(), GURL(url::kAboutBlankURL), NEW_WINDOW, |
| 73 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 73 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
| 74 BrowserList* active_browser_list = | 74 BrowserList* active_browser_list = |
| 75 BrowserList::GetInstance(browser()->host_desktop_type()); | 75 BrowserList::GetInstance(browser()->host_desktop_type()); |
| 76 EXPECT_EQ(2u, active_browser_list->size()); | 76 EXPECT_EQ(2u, active_browser_list->size()); |
| 77 | 77 |
| 78 // Close the first browser. | 78 // Close the first browser. |
| 79 CloseBrowser(browser()); | 79 CloseBrowser(browser()); |
| 80 EXPECT_EQ(1u, active_browser_list->size()); | 80 EXPECT_EQ(1u, active_browser_list->size()); |
| 81 | 81 |
| 82 // Restore tabs using the browser's recent tabs menu. | 82 // Restore tabs using the browser's recent tabs menu. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 96 CheckVisbility(browser->tab_strip_model(), 1); | 96 CheckVisbility(browser->tab_strip_model(), 1); |
| 97 } | 97 } |
| 98 | 98 |
| 99 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { | 99 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { |
| 100 // Create tabs. | 100 // Create tabs. |
| 101 CreateTestTabs(browser()); | 101 CreateTestTabs(browser()); |
| 102 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 102 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
| 103 | 103 |
| 104 // Create a new browser. | 104 // Create a new browser. |
| 105 ui_test_utils::NavigateToURLWithDisposition( | 105 ui_test_utils::NavigateToURLWithDisposition( |
| 106 browser(), GURL(content::kAboutBlankURL), NEW_WINDOW, | 106 browser(), GURL(url::kAboutBlankURL), NEW_WINDOW, |
| 107 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 107 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
| 108 BrowserList* active_browser_list = | 108 BrowserList* active_browser_list = |
| 109 BrowserList::GetInstance(browser()->host_desktop_type()); | 109 BrowserList::GetInstance(browser()->host_desktop_type()); |
| 110 EXPECT_EQ(2u, active_browser_list->size()); | 110 EXPECT_EQ(2u, active_browser_list->size()); |
| 111 | 111 |
| 112 // Close the first browser. | 112 // Close the first browser. |
| 113 CloseBrowser(browser()); | 113 CloseBrowser(browser()); |
| 114 EXPECT_EQ(1u, active_browser_list->size()); | 114 EXPECT_EQ(1u, active_browser_list->size()); |
| 115 | 115 |
| 116 // Check the browser has a delegated restore service. | 116 // Check the browser has a delegated restore service. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 132 AwaitTabsReady(&queue, 2); | 132 AwaitTabsReady(&queue, 2); |
| 133 | 133 |
| 134 // There should be 3 restored tabs in the new browser. | 134 // There should be 3 restored tabs in the new browser. |
| 135 EXPECT_EQ(2u, active_browser_list->size()); | 135 EXPECT_EQ(2u, active_browser_list->size()); |
| 136 browser = active_browser_list->get(1); | 136 browser = active_browser_list->get(1); |
| 137 EXPECT_EQ(3, browser->tab_strip_model()->count()); | 137 EXPECT_EQ(3, browser->tab_strip_model()->count()); |
| 138 | 138 |
| 139 // The middle tab only should have visible disposition. | 139 // The middle tab only should have visible disposition. |
| 140 CheckVisbility(browser->tab_strip_model(), 1); | 140 CheckVisbility(browser->tab_strip_model(), 1); |
| 141 } | 141 } |
| OLD | NEW |