OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/sync/profile_sync_service.h" | 5 #include "chrome/browser/sync/profile_sync_service.h" |
6 | 6 |
7 #include <cstddef> | 7 #include <cstddef> |
8 #include <map> | 8 #include <map> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/strings/stringprintf.h" | 23 #include "base/strings/stringprintf.h" |
24 #include "base/threading/thread_restrictions.h" | 24 #include "base/threading/thread_restrictions.h" |
25 #include "build/build_config.h" | 25 #include "build/build_config.h" |
26 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" | 26 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h" |
27 #include "chrome/browser/browser_process.h" | 27 #include "chrome/browser/browser_process.h" |
28 #include "chrome/browser/chrome_notification_types.h" | 28 #include "chrome/browser/chrome_notification_types.h" |
29 #include "chrome/browser/defaults.h" | 29 #include "chrome/browser/defaults.h" |
30 #include "chrome/browser/net/chrome_cookie_notification_details.h" | 30 #include "chrome/browser/net/chrome_cookie_notification_details.h" |
31 #include "chrome/browser/prefs/pref_service_syncable.h" | 31 #include "chrome/browser/prefs/pref_service_syncable.h" |
32 #include "chrome/browser/profiles/profile.h" | 32 #include "chrome/browser/profiles/profile.h" |
33 #include "chrome/browser/services/gcm/gcm_driver.h" | |
34 #include "chrome/browser/services/gcm/gcm_profile_service.h" | 33 #include "chrome/browser/services/gcm/gcm_profile_service.h" |
35 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" | 34 #include "chrome/browser/services/gcm/gcm_profile_service_factory.h" |
36 #include "chrome/browser/signin/about_signin_internals_factory.h" | 35 #include "chrome/browser/signin/about_signin_internals_factory.h" |
37 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 36 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
38 #include "chrome/browser/signin/signin_manager_factory.h" | 37 #include "chrome/browser/signin/signin_manager_factory.h" |
39 #include "chrome/browser/sync/backend_migrator.h" | 38 #include "chrome/browser/sync/backend_migrator.h" |
40 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" | 39 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" |
41 #include "chrome/browser/sync/glue/device_info.h" | 40 #include "chrome/browser/sync/glue/device_info.h" |
42 #include "chrome/browser/sync/glue/favicon_cache.h" | 41 #include "chrome/browser/sync/glue/favicon_cache.h" |
43 #include "chrome/browser/sync/glue/sync_backend_host.h" | 42 #include "chrome/browser/sync/glue/sync_backend_host.h" |
44 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" | 43 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" |
45 #include "chrome/browser/sync/glue/sync_start_util.h" | 44 #include "chrome/browser/sync/glue/sync_start_util.h" |
46 #include "chrome/browser/sync/glue/synced_device_tracker.h" | 45 #include "chrome/browser/sync/glue/synced_device_tracker.h" |
47 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" | 46 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" |
48 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" | 47 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" |
49 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 48 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
50 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" | 49 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" |
51 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 50 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
52 #include "chrome/browser/sync/sync_error_controller.h" | 51 #include "chrome/browser/sync/sync_error_controller.h" |
53 #include "chrome/browser/ui/browser.h" | 52 #include "chrome/browser/ui/browser.h" |
54 #include "chrome/browser/ui/browser_list.h" | 53 #include "chrome/browser/ui/browser_list.h" |
55 #include "chrome/browser/ui/browser_window.h" | 54 #include "chrome/browser/ui/browser_window.h" |
56 #include "chrome/browser/ui/global_error/global_error_service.h" | 55 #include "chrome/browser/ui/global_error/global_error_service.h" |
57 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 56 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
58 #include "chrome/common/chrome_switches.h" | 57 #include "chrome/common/chrome_switches.h" |
59 #include "chrome/common/chrome_version_info.h" | 58 #include "chrome/common/chrome_version_info.h" |
60 #include "chrome/common/pref_names.h" | 59 #include "chrome/common/pref_names.h" |
61 #include "chrome/common/url_constants.h" | 60 #include "chrome/common/url_constants.h" |
| 61 #include "components/gcm_driver/gcm_driver.h" |
62 #include "components/pref_registry/pref_registry_syncable.h" | 62 #include "components/pref_registry/pref_registry_syncable.h" |
63 #include "components/signin/core/browser/about_signin_internals.h" | 63 #include "components/signin/core/browser/about_signin_internals.h" |
64 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 64 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
65 #include "components/signin/core/browser/signin_manager.h" | 65 #include "components/signin/core/browser/signin_manager.h" |
66 #include "components/sync_driver/change_processor.h" | 66 #include "components/sync_driver/change_processor.h" |
67 #include "components/sync_driver/data_type_controller.h" | 67 #include "components/sync_driver/data_type_controller.h" |
68 #include "components/sync_driver/pref_names.h" | 68 #include "components/sync_driver/pref_names.h" |
69 #include "components/sync_driver/system_encryptor.h" | 69 #include "components/sync_driver/system_encryptor.h" |
70 #include "components/sync_driver/user_selectable_sync_type.h" | 70 #include "components/sync_driver/user_selectable_sync_type.h" |
71 #include "content/public/browser/notification_details.h" | 71 #include "content/public/browser/notification_details.h" |
(...skipping 2274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2346 status.last_get_token_error = last_get_token_error_; | 2346 status.last_get_token_error = last_get_token_error_; |
2347 if (request_access_token_retry_timer_.IsRunning()) | 2347 if (request_access_token_retry_timer_.IsRunning()) |
2348 status.next_token_request_time = next_token_request_time_; | 2348 status.next_token_request_time = next_token_request_time_; |
2349 return status; | 2349 return status; |
2350 } | 2350 } |
2351 | 2351 |
2352 void ProfileSyncService::OverrideNetworkResourcesForTest( | 2352 void ProfileSyncService::OverrideNetworkResourcesForTest( |
2353 scoped_ptr<syncer::NetworkResources> network_resources) { | 2353 scoped_ptr<syncer::NetworkResources> network_resources) { |
2354 network_resources_ = network_resources.Pass(); | 2354 network_resources_ = network_resources.Pass(); |
2355 } | 2355 } |
OLD | NEW |