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_factory.h" | 6 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
8 #include "chrome/browser/ui/browser_commands.h" | 8 #include "chrome/browser/ui/browser_commands.h" |
9 #include "chrome/browser/ui/browser_list.h" | 9 #include "chrome/browser/ui/browser_list.h" |
10 #include "chrome/browser/ui/browser_live_tab_context.h" | 10 #include "chrome/browser/ui/browser_live_tab_context.h" |
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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(), | 72 browser(), |
73 GURL(url::kAboutBlankURL), | 73 GURL(url::kAboutBlankURL), |
74 NEW_WINDOW, | 74 NEW_WINDOW, |
75 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 75 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
76 BrowserList* active_browser_list = | 76 BrowserList* active_browser_list = BrowserList::GetInstance(); |
77 BrowserList::GetInstance(browser()->host_desktop_type()); | |
78 EXPECT_EQ(2u, active_browser_list->size()); | 77 EXPECT_EQ(2u, active_browser_list->size()); |
79 | 78 |
80 // Close the first browser. | 79 // Close the first browser. |
81 CloseBrowser(browser()); | 80 CloseBrowser(browser()); |
82 EXPECT_EQ(1u, active_browser_list->size()); | 81 EXPECT_EQ(1u, active_browser_list->size()); |
83 | 82 |
84 // Restore tabs using the browser's recent tabs menu. | 83 // Restore tabs using the browser's recent tabs menu. |
85 content::DOMMessageQueue queue; | 84 content::DOMMessageQueue queue; |
86 Browser* browser = active_browser_list->get(0); | 85 Browser* browser = active_browser_list->get(0); |
87 RecentTabsSubMenuModel menu(NULL, browser, NULL); | 86 RecentTabsSubMenuModel menu(NULL, browser, NULL); |
(...skipping 14 matching lines...) Expand all Loading... |
102 // Create tabs. | 101 // Create tabs. |
103 CreateTestTabs(browser()); | 102 CreateTestTabs(browser()); |
104 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 103 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
105 | 104 |
106 // Create a new browser. | 105 // Create a new browser. |
107 ui_test_utils::NavigateToURLWithDisposition( | 106 ui_test_utils::NavigateToURLWithDisposition( |
108 browser(), | 107 browser(), |
109 GURL(url::kAboutBlankURL), | 108 GURL(url::kAboutBlankURL), |
110 NEW_WINDOW, | 109 NEW_WINDOW, |
111 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 110 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
112 BrowserList* active_browser_list = | 111 BrowserList* active_browser_list = BrowserList::GetInstance(); |
113 BrowserList::GetInstance(browser()->host_desktop_type()); | |
114 EXPECT_EQ(2u, active_browser_list->size()); | 112 EXPECT_EQ(2u, active_browser_list->size()); |
115 | 113 |
116 // Close the first browser. | 114 // Close the first browser. |
117 CloseBrowser(browser()); | 115 CloseBrowser(browser()); |
118 EXPECT_EQ(1u, active_browser_list->size()); | 116 EXPECT_EQ(1u, active_browser_list->size()); |
119 | 117 |
120 // Check the browser has a delegated restore service. | 118 // Check the browser has a delegated restore service. |
121 Browser* browser = active_browser_list->get(0); | 119 Browser* browser = active_browser_list->get(0); |
122 sessions::TabRestoreService* service = | 120 sessions::TabRestoreService* service = |
123 TabRestoreServiceFactory::GetForProfile(browser->profile()); | 121 TabRestoreServiceFactory::GetForProfile(browser->profile()); |
(...skipping 12 matching lines...) Expand all Loading... |
136 AwaitTabsReady(&queue, 2); | 134 AwaitTabsReady(&queue, 2); |
137 | 135 |
138 // There should be 3 restored tabs in the new browser. | 136 // There should be 3 restored tabs in the new browser. |
139 EXPECT_EQ(2u, active_browser_list->size()); | 137 EXPECT_EQ(2u, active_browser_list->size()); |
140 browser = active_browser_list->get(1); | 138 browser = active_browser_list->get(1); |
141 EXPECT_EQ(3, browser->tab_strip_model()->count()); | 139 EXPECT_EQ(3, browser->tab_strip_model()->count()); |
142 | 140 |
143 // The middle tab only should have visible disposition. | 141 // The middle tab only should have visible disposition. |
144 CheckVisbility(browser->tab_strip_model(), 1); | 142 CheckVisbility(browser->tab_strip_model(), 1); |
145 } | 143 } |
OLD | NEW |