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/persistent_tab_restore_service.h" | 14 #include "chrome/browser/sessions/persistent_tab_restore_service.h" |
15 #include "chrome/browser/sessions/session_service.h" | 15 #include "chrome/browser/sessions/session_service.h" |
16 #include "chrome/browser/sessions/session_service_factory.h" | 16 #include "chrome/browser/sessions/session_service_factory.h" |
17 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 17 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
18 #include "chrome/browser/sync/profile_sync_service_mock.h" | 18 #include "chrome/browser/sync/profile_sync_service_mock.h" |
19 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 19 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
20 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
21 #include "chrome/browser/ui/browser_tabstrip.h" | 21 #include "chrome/browser/ui/browser_tabstrip.h" |
| 22 #include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.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" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/test/base/browser_with_test_window_test.h" | 26 #include "chrome/test/base/browser_with_test_window_test.h" |
26 #include "chrome/test/base/menu_model_test.h" | 27 #include "chrome/test/base/menu_model_test.h" |
27 #include "chrome/test/base/testing_profile.h" | 28 #include "chrome/test/base/testing_profile.h" |
28 #include "components/sessions/serialized_navigation_entry_test_helper.h" | 29 #include "components/sessions/serialized_navigation_entry_test_helper.h" |
29 #include "components/sessions/session_types.h" | 30 #include "components/sessions/session_types.h" |
30 #include "components/sync_driver/glue/synced_session.h" | 31 #include "components/sync_driver/glue/synced_session.h" |
31 #include "components/sync_driver/local_device_info_provider_mock.h" | 32 #include "components/sync_driver/local_device_info_provider_mock.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 RecentTabsSubMenuModelTest() | 117 RecentTabsSubMenuModelTest() |
117 : sync_service_(&testing_profile_), | 118 : sync_service_(&testing_profile_), |
118 local_device_(new sync_driver::LocalDeviceInfoProviderMock( | 119 local_device_(new sync_driver::LocalDeviceInfoProviderMock( |
119 "RecentTabsSubMenuModelTest", | 120 "RecentTabsSubMenuModelTest", |
120 "Test Machine", | 121 "Test Machine", |
121 "Chromium 10k", | 122 "Chromium 10k", |
122 "Chrome 10k", | 123 "Chrome 10k", |
123 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, | 124 sync_pb::SyncEnums_DeviceType_TYPE_LINUX, |
124 "device_id")) { | 125 "device_id")) { |
125 manager_.reset(new browser_sync::SessionsSyncManager( | 126 manager_.reset(new browser_sync::SessionsSyncManager( |
126 &testing_profile_, | 127 &testing_profile_, local_device_.get(), |
127 local_device_.get(), | 128 scoped_ptr<browser_sync::LocalSessionEventRouter>(new DummyRouter()), |
128 scoped_ptr<browser_sync::LocalSessionEventRouter>( | 129 scoped_ptr<browser_sync::SyncedWindowDelegatesGetter>( |
129 new DummyRouter()))); | 130 new browser_sync::BrowserSyncedWindowDelegatesGetter()))); |
130 manager_->MergeDataAndStartSyncing( | 131 manager_->MergeDataAndStartSyncing( |
131 syncer::SESSIONS, | 132 syncer::SESSIONS, |
132 syncer::SyncDataList(), | 133 syncer::SyncDataList(), |
133 scoped_ptr<syncer::SyncChangeProcessor>( | 134 scoped_ptr<syncer::SyncChangeProcessor>( |
134 new syncer::FakeSyncChangeProcessor), | 135 new syncer::FakeSyncChangeProcessor), |
135 scoped_ptr<syncer::SyncErrorFactory>( | 136 scoped_ptr<syncer::SyncErrorFactory>( |
136 new syncer::SyncErrorFactoryMock)); | 137 new syncer::SyncErrorFactoryMock)); |
137 } | 138 } |
138 | 139 |
139 void WaitForLoadFromLastSession() { | 140 void WaitForLoadFromLastSession() { |
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
590 // 2 Recently closed heaer (disabled) | 591 // 2 Recently closed heaer (disabled) |
591 // 3 <separator> | 592 // 3 <separator> |
592 // 4 No tabs from other Devices | 593 // 4 No tabs from other Devices |
593 | 594 |
594 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); | 595 TestRecentTabsSubMenuModel model(NULL, browser(), NULL); |
595 EXPECT_EQ(5, model.GetItemCount()); | 596 EXPECT_EQ(5, model.GetItemCount()); |
596 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); | 597 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(2)); |
597 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); | 598 EXPECT_NE(-1, model.GetMaxWidthForItemAtIndex(3)); |
598 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); | 599 EXPECT_EQ(-1, model.GetMaxWidthForItemAtIndex(4)); |
599 } | 600 } |
OLD | NEW |