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_tab_restore_service_delegate.h" | 10 #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 if (i == visible_index) { | 38 if (i == visible_index) { |
39 EXPECT_EQ("visible", document_visibility_state); | 39 EXPECT_EQ("visible", document_visibility_state); |
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-visibilty.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, 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, 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( |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 AwaitTabsReady(&queue, 2); | 136 AwaitTabsReady(&queue, 2); |
137 | 137 |
138 // There should be 3 restored tabs in the new browser. | 138 // There should be 3 restored tabs in the new browser. |
139 EXPECT_EQ(2u, active_browser_list->size()); | 139 EXPECT_EQ(2u, active_browser_list->size()); |
140 browser = active_browser_list->get(1); | 140 browser = active_browser_list->get(1); |
141 EXPECT_EQ(3, browser->tab_strip_model()->count()); | 141 EXPECT_EQ(3, browser->tab_strip_model()->count()); |
142 | 142 |
143 // The middle tab only should have visible disposition. | 143 // The middle tab only should have visible disposition. |
144 CheckVisbility(browser->tab_strip_model(), 1); | 144 CheckVisbility(browser->tab_strip_model(), 1); |
145 } | 145 } |
OLD | NEW |