OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/run_loop.h" | 12 #include "base/run_loop.h" |
13 #include "chrome/app/chrome_command_ids.h" | 13 #include "chrome/app/chrome_command_ids.h" |
| 14 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" |
14 #include "chrome/browser/sessions/persistent_tab_restore_service.h" | 15 #include "chrome/browser/sessions/persistent_tab_restore_service.h" |
15 #include "chrome/browser/sessions/session_service.h" | 16 #include "chrome/browser/sessions/session_service.h" |
16 #include "chrome/browser/sessions/session_service_factory.h" | 17 #include "chrome/browser/sessions/session_service_factory.h" |
17 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 18 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
18 #include "chrome/browser/sync/profile_sync_service_mock.h" | 19 #include "chrome/browser/sync/profile_sync_service_mock.h" |
19 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 20 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
20 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
21 #include "chrome/browser/ui/browser_tabstrip.h" | 22 #include "chrome/browser/ui/browser_tabstrip.h" |
22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 23 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
23 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" | 24 #include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h" |
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 new syncer::SyncErrorFactoryMock)); | 137 new syncer::SyncErrorFactoryMock)); |
137 } | 138 } |
138 | 139 |
139 void WaitForLoadFromLastSession() { | 140 void WaitForLoadFromLastSession() { |
140 content::RunAllBlockingPoolTasksUntilIdle(); | 141 content::RunAllBlockingPoolTasksUntilIdle(); |
141 } | 142 } |
142 | 143 |
143 static scoped_ptr<KeyedService> GetTabRestoreService( | 144 static scoped_ptr<KeyedService> GetTabRestoreService( |
144 content::BrowserContext* browser_context) { | 145 content::BrowserContext* browser_context) { |
145 return make_scoped_ptr(new PersistentTabRestoreService( | 146 return make_scoped_ptr(new PersistentTabRestoreService( |
146 Profile::FromBrowserContext(browser_context), NULL)); | 147 Profile::FromBrowserContext(browser_context), |
| 148 make_scoped_ptr(new ChromeTabRestoreServiceClient( |
| 149 Profile::FromBrowserContext(browser_context))), |
| 150 nullptr)); |
147 } | 151 } |
148 | 152 |
149 sync_driver::OpenTabsUIDelegate* GetOpenTabsDelegate() { | 153 sync_driver::OpenTabsUIDelegate* GetOpenTabsDelegate() { |
150 return manager_.get(); | 154 return manager_.get(); |
151 } | 155 } |
152 | 156 |
153 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { | 157 void RegisterRecentTabs(RecentTabsBuilderTestHelper* helper) { |
154 helper->ExportToSessionsSyncManager(manager_.get()); | 158 helper->ExportToSessionsSyncManager(manager_.get()); |
155 } | 159 } |
156 | 160 |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 // 2 Recently closed heaer (disabled) | 594 // 2 Recently closed heaer (disabled) |
591 // 3 <separator> | 595 // 3 <separator> |
592 // 4 No tabs from other Devices | 596 // 4 No tabs from other Devices |
593 | 597 |
594 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 598 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
595 EXPECT_EQ(5, model.GetItemCount()); | 599 EXPECT_EQ(5, model.GetItemCount()); |
596 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); | 600 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); |
597 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); | 601 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); |
598 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); | 602 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); |
599 } | 603 } |
OLD | NEW |