| 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 <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "base/threading/thread_restrictions.h" | 26 #include "base/threading/thread_restrictions.h" |
| 27 #include "build/build_config.h" | 27 #include "build/build_config.h" |
| 28 #include "chrome/browser/browser_process.h" | 28 #include "chrome/browser/browser_process.h" |
| 29 #include "chrome/browser/browsing_data/browsing_data_helper.h" | 29 #include "chrome/browser/browsing_data/browsing_data_helper.h" |
| 30 #include "chrome/browser/chrome_notification_types.h" | 30 #include "chrome/browser/chrome_notification_types.h" |
| 31 #include "chrome/browser/defaults.h" | 31 #include "chrome/browser/defaults.h" |
| 32 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" | 32 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" |
| 33 #include "chrome/browser/net/chrome_cookie_notification_details.h" | 33 #include "chrome/browser/net/chrome_cookie_notification_details.h" |
| 34 #include "chrome/browser/password_manager/password_store_factory.h" | 34 #include "chrome/browser/password_manager/password_store_factory.h" |
| 35 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 35 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| 36 #include "chrome/browser/prefs/pref_service_syncable.h" | |
| 37 #include "chrome/browser/profiles/profile.h" | 36 #include "chrome/browser/profiles/profile.h" |
| 38 #include "chrome/browser/signin/about_signin_internals_factory.h" | 37 #include "chrome/browser/signin/about_signin_internals_factory.h" |
| 39 #include "chrome/browser/signin/chrome_signin_client_factory.h" | 38 #include "chrome/browser/signin/chrome_signin_client_factory.h" |
| 40 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 39 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| 41 #include "chrome/browser/signin/signin_manager_factory.h" | 40 #include "chrome/browser/signin/signin_manager_factory.h" |
| 42 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" | 41 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.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/typed_url_data_type_controller.h" | 45 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 73 #include "components/sync_driver/device_info.h" | 72 #include "components/sync_driver/device_info.h" |
| 74 #include "components/sync_driver/favicon_cache.h" | 73 #include "components/sync_driver/favicon_cache.h" |
| 75 #include "components/sync_driver/pref_names.h" | 74 #include "components/sync_driver/pref_names.h" |
| 76 #include "components/sync_driver/sync_api_component_factory.h" | 75 #include "components/sync_driver/sync_api_component_factory.h" |
| 77 #include "components/sync_driver/sync_driver_switches.h" | 76 #include "components/sync_driver/sync_driver_switches.h" |
| 78 #include "components/sync_driver/sync_error_controller.h" | 77 #include "components/sync_driver/sync_error_controller.h" |
| 79 #include "components/sync_driver/sync_stopped_reporter.h" | 78 #include "components/sync_driver/sync_stopped_reporter.h" |
| 80 #include "components/sync_driver/sync_util.h" | 79 #include "components/sync_driver/sync_util.h" |
| 81 #include "components/sync_driver/system_encryptor.h" | 80 #include "components/sync_driver/system_encryptor.h" |
| 82 #include "components/sync_driver/user_selectable_sync_type.h" | 81 #include "components/sync_driver/user_selectable_sync_type.h" |
| 82 #include "components/syncable_prefs/pref_service_syncable.h" |
| 83 #include "components/version_info/version_info_values.h" | 83 #include "components/version_info/version_info_values.h" |
| 84 #include "content/public/browser/browser_thread.h" | 84 #include "content/public/browser/browser_thread.h" |
| 85 #include "content/public/browser/notification_details.h" | 85 #include "content/public/browser/notification_details.h" |
| 86 #include "content/public/browser/notification_service.h" | 86 #include "content/public/browser/notification_service.h" |
| 87 #include "content/public/browser/notification_source.h" | 87 #include "content/public/browser/notification_source.h" |
| 88 #include "net/cookies/cookie_monster.h" | 88 #include "net/cookies/cookie_monster.h" |
| 89 #include "net/url_request/url_request_context_getter.h" | 89 #include "net/url_request/url_request_context_getter.h" |
| 90 #include "sync/api/sync_error.h" | 90 #include "sync/api/sync_error.h" |
| 91 #include "sync/internal_api/public/configure_reason.h" | 91 #include "sync/internal_api/public/configure_reason.h" |
| 92 #include "sync/internal_api/public/http_bridge_network_resources.h" | 92 #include "sync/internal_api/public/http_bridge_network_resources.h" |
| (...skipping 2631 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2724 } | 2724 } |
| 2725 | 2725 |
| 2726 std::string ProfileSyncService::unrecoverable_error_message() const { | 2726 std::string ProfileSyncService::unrecoverable_error_message() const { |
| 2727 return unrecoverable_error_message_; | 2727 return unrecoverable_error_message_; |
| 2728 } | 2728 } |
| 2729 | 2729 |
| 2730 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() | 2730 tracked_objects::Location ProfileSyncService::unrecoverable_error_location() |
| 2731 const { | 2731 const { |
| 2732 return unrecoverable_error_location_; | 2732 return unrecoverable_error_location_; |
| 2733 } | 2733 } |
| OLD | NEW |