| 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 30 matching lines...) Expand all Loading... |
| 41 #include "chrome/browser/signin/signin_manager_factory.h" | 41 #include "chrome/browser/signin/signin_manager_factory.h" |
| 42 #include "chrome/browser/sync/backend_migrator.h" | 42 #include "chrome/browser/sync/backend_migrator.h" |
| 43 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" | 43 #include "chrome/browser/sync/glue/chrome_report_unrecoverable_error.h" |
| 44 #include "chrome/browser/sync/glue/device_info.h" | 44 #include "chrome/browser/sync/glue/device_info.h" |
| 45 #include "chrome/browser/sync/glue/favicon_cache.h" | 45 #include "chrome/browser/sync/glue/favicon_cache.h" |
| 46 #include "chrome/browser/sync/glue/sync_backend_host.h" | 46 #include "chrome/browser/sync/glue/sync_backend_host.h" |
| 47 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" | 47 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" |
| 48 #include "chrome/browser/sync/glue/sync_start_util.h" | 48 #include "chrome/browser/sync/glue/sync_start_util.h" |
| 49 #include "chrome/browser/sync/glue/synced_device_tracker.h" | 49 #include "chrome/browser/sync/glue/synced_device_tracker.h" |
| 50 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" | 50 #include "chrome/browser/sync/glue/typed_url_data_type_controller.h" |
| 51 #include "chrome/browser/sync/managed_user_signin_manager_wrapper.h" | |
| 52 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" | 51 #include "chrome/browser/sync/profile_sync_components_factory_impl.h" |
| 53 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" | 52 #include "chrome/browser/sync/sessions/notification_service_sessions_router.h" |
| 54 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" | 53 #include "chrome/browser/sync/sessions/sessions_sync_manager.h" |
| 54 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" |
| 55 #include "chrome/browser/sync/sync_error_controller.h" | 55 #include "chrome/browser/sync/sync_error_controller.h" |
| 56 #include "chrome/browser/ui/browser.h" | 56 #include "chrome/browser/ui/browser.h" |
| 57 #include "chrome/browser/ui/browser_list.h" | 57 #include "chrome/browser/ui/browser_list.h" |
| 58 #include "chrome/browser/ui/browser_window.h" | 58 #include "chrome/browser/ui/browser_window.h" |
| 59 #include "chrome/browser/ui/global_error/global_error_service.h" | 59 #include "chrome/browser/ui/global_error/global_error_service.h" |
| 60 #include "chrome/browser/ui/global_error/global_error_service_factory.h" | 60 #include "chrome/browser/ui/global_error/global_error_service_factory.h" |
| 61 #include "chrome/common/chrome_switches.h" | 61 #include "chrome/common/chrome_switches.h" |
| 62 #include "chrome/common/chrome_version_info.h" | 62 #include "chrome/common/chrome_version_info.h" |
| 63 #include "chrome/common/pref_names.h" | 63 #include "chrome/common/pref_names.h" |
| 64 #include "chrome/common/url_constants.h" | 64 #include "chrome/common/url_constants.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 179 bool ShouldShowActionOnUI( | 179 bool ShouldShowActionOnUI( |
| 180 const syncer::SyncProtocolError& error) { | 180 const syncer::SyncProtocolError& error) { |
| 181 return (error.action != syncer::UNKNOWN_ACTION && | 181 return (error.action != syncer::UNKNOWN_ACTION && |
| 182 error.action != syncer::DISABLE_SYNC_ON_CLIENT && | 182 error.action != syncer::DISABLE_SYNC_ON_CLIENT && |
| 183 error.action != syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT); | 183 error.action != syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT); |
| 184 } | 184 } |
| 185 | 185 |
| 186 ProfileSyncService::ProfileSyncService( | 186 ProfileSyncService::ProfileSyncService( |
| 187 ProfileSyncComponentsFactory* factory, | 187 ProfileSyncComponentsFactory* factory, |
| 188 Profile* profile, | 188 Profile* profile, |
| 189 scoped_ptr<ManagedUserSigninManagerWrapper> signin_wrapper, | 189 scoped_ptr<SupervisedUserSigninManagerWrapper> signin_wrapper, |
| 190 ProfileOAuth2TokenService* oauth2_token_service, | 190 ProfileOAuth2TokenService* oauth2_token_service, |
| 191 ProfileSyncServiceStartBehavior start_behavior) | 191 ProfileSyncServiceStartBehavior start_behavior) |
| 192 : OAuth2TokenService::Consumer("sync"), | 192 : OAuth2TokenService::Consumer("sync"), |
| 193 last_auth_error_(AuthError::AuthErrorNone()), | 193 last_auth_error_(AuthError::AuthErrorNone()), |
| 194 passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED), | 194 passphrase_required_reason_(syncer::REASON_PASSPHRASE_NOT_REQUIRED), |
| 195 factory_(factory), | 195 factory_(factory), |
| 196 profile_(profile), | 196 profile_(profile), |
| 197 sync_prefs_(profile_->GetPrefs()), | 197 sync_prefs_(profile_->GetPrefs()), |
| 198 sync_service_url_(GetSyncServiceURL(*CommandLine::ForCurrentProcess())), | 198 sync_service_url_(GetSyncServiceURL(*CommandLine::ForCurrentProcess())), |
| 199 is_first_time_sync_configure_(false), | 199 is_first_time_sync_configure_(false), |
| (...skipping 2368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2568 if (custom_sync_url.is_valid()) { | 2568 if (custom_sync_url.is_valid()) { |
| 2569 result = custom_sync_url; | 2569 result = custom_sync_url; |
| 2570 } else { | 2570 } else { |
| 2571 LOG(WARNING) << "The following sync URL specified at the command-line " | 2571 LOG(WARNING) << "The following sync URL specified at the command-line " |
| 2572 << "is invalid: " << value; | 2572 << "is invalid: " << value; |
| 2573 } | 2573 } |
| 2574 } | 2574 } |
| 2575 } | 2575 } |
| 2576 return result; | 2576 return result; |
| 2577 } | 2577 } |
| OLD | NEW |