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 29 matching lines...) Expand all Loading... |
40 } else { | 40 } else { |
41 EXPECT_EQ("hidden", document_visibility_state); | 41 EXPECT_EQ("hidden", document_visibility_state); |
42 } | 42 } |
43 } | 43 } |
44 } | 44 } |
45 | 45 |
46 void CreateTestTabs(Browser* browser) { | 46 void CreateTestTabs(Browser* browser) { |
47 GURL test_page(ui_test_utils::GetTestUrl(base::FilePath(), | 47 GURL test_page(ui_test_utils::GetTestUrl(base::FilePath(), |
48 base::FilePath(FILE_PATH_LITERAL("tab-restore-visibility.html")))); | 48 base::FilePath(FILE_PATH_LITERAL("tab-restore-visibility.html")))); |
49 ui_test_utils::NavigateToURLWithDisposition( | 49 ui_test_utils::NavigateToURLWithDisposition( |
50 browser, test_page, NEW_FOREGROUND_TAB, | 50 browser, test_page, WindowOpenDisposition::NEW_FOREGROUND_TAB, |
51 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 51 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
52 ui_test_utils::NavigateToURLWithDisposition( | 52 ui_test_utils::NavigateToURLWithDisposition( |
53 browser, test_page, NEW_BACKGROUND_TAB, | 53 browser, test_page, WindowOpenDisposition::NEW_BACKGROUND_TAB, |
54 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 54 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
55 } | 55 } |
56 | 56 |
57 void CloseBrowser(Browser* browser) { | 57 void CloseBrowser(Browser* browser) { |
58 content::WindowedNotificationObserver close_observer( | 58 content::WindowedNotificationObserver close_observer( |
59 chrome::NOTIFICATION_BROWSER_CLOSED, | 59 chrome::NOTIFICATION_BROWSER_CLOSED, |
60 content::Source<Browser>(browser)); | 60 content::Source<Browser>(browser)); |
61 chrome::CloseWindow(browser); | 61 chrome::CloseWindow(browser); |
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(), | 72 browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW, |
73 GURL(url::kAboutBlankURL), | |
74 NEW_WINDOW, | |
75 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 73 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
76 BrowserList* active_browser_list = BrowserList::GetInstance(); | 74 BrowserList* active_browser_list = BrowserList::GetInstance(); |
77 EXPECT_EQ(2u, active_browser_list->size()); | 75 EXPECT_EQ(2u, active_browser_list->size()); |
78 | 76 |
79 // Close the first browser. | 77 // Close the first browser. |
80 CloseBrowser(browser()); | 78 CloseBrowser(browser()); |
81 EXPECT_EQ(1u, active_browser_list->size()); | 79 EXPECT_EQ(1u, active_browser_list->size()); |
82 | 80 |
83 // Restore tabs using the browser's recent tabs menu. | 81 // Restore tabs using the browser's recent tabs menu. |
84 content::DOMMessageQueue queue; | 82 content::DOMMessageQueue queue; |
(...skipping 12 matching lines...) Expand all Loading... |
97 CheckVisbility(browser->tab_strip_model(), 1); | 95 CheckVisbility(browser->tab_strip_model(), 1); |
98 } | 96 } |
99 | 97 |
100 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { | 98 IN_PROC_BROWSER_TEST_F(BrowserTabRestoreTest, DelegateRestoreTabDisposition) { |
101 // Create tabs. | 99 // Create tabs. |
102 CreateTestTabs(browser()); | 100 CreateTestTabs(browser()); |
103 EXPECT_EQ(3, browser()->tab_strip_model()->count()); | 101 EXPECT_EQ(3, browser()->tab_strip_model()->count()); |
104 | 102 |
105 // Create a new browser. | 103 // Create a new browser. |
106 ui_test_utils::NavigateToURLWithDisposition( | 104 ui_test_utils::NavigateToURLWithDisposition( |
107 browser(), | 105 browser(), GURL(url::kAboutBlankURL), WindowOpenDisposition::NEW_WINDOW, |
108 GURL(url::kAboutBlankURL), | |
109 NEW_WINDOW, | |
110 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); | 106 ui_test_utils::BROWSER_TEST_WAIT_FOR_BROWSER); |
111 BrowserList* active_browser_list = BrowserList::GetInstance(); | 107 BrowserList* active_browser_list = BrowserList::GetInstance(); |
112 EXPECT_EQ(2u, active_browser_list->size()); | 108 EXPECT_EQ(2u, active_browser_list->size()); |
113 | 109 |
114 // Close the first browser. | 110 // Close the first browser. |
115 CloseBrowser(browser()); | 111 CloseBrowser(browser()); |
116 EXPECT_EQ(1u, active_browser_list->size()); | 112 EXPECT_EQ(1u, active_browser_list->size()); |
117 | 113 |
118 // Check the browser has a delegated restore service. | 114 // Check the browser has a delegated restore service. |
119 Browser* browser = active_browser_list->get(0); | 115 Browser* browser = active_browser_list->get(0); |
(...skipping 13 matching lines...) Expand all Loading... |
133 AwaitTabsReady(&queue, 2); | 129 AwaitTabsReady(&queue, 2); |
134 | 130 |
135 // There should be 3 restored tabs in the new browser. | 131 // There should be 3 restored tabs in the new browser. |
136 EXPECT_EQ(2u, active_browser_list->size()); | 132 EXPECT_EQ(2u, active_browser_list->size()); |
137 browser = active_browser_list->get(1); | 133 browser = active_browser_list->get(1); |
138 EXPECT_EQ(3, browser->tab_strip_model()->count()); | 134 EXPECT_EQ(3, browser->tab_strip_model()->count()); |
139 | 135 |
140 // The middle tab only should have visible disposition. | 136 // The middle tab only should have visible disposition. |
141 CheckVisbility(browser->tab_strip_model(), 1); | 137 CheckVisbility(browser->tab_strip_model(), 1); |
142 } | 138 } |
OLD | NEW |