| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/extensions/extension_sync_service.h" | 5 #include "chrome/browser/extensions/extension_sync_service.h" |
| 6 | 6 |
| 7 #include <iterator> | 7 #include <iterator> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/threading/sequenced_worker_pool.h" | 10 #include "base/threading/sequenced_worker_pool.h" |
| 11 #include "base/threading/thread_restrictions.h" | 11 #include "base/threading/thread_restrictions.h" |
| 12 #include "chrome/browser/extensions/app_sync_data.h" | 12 #include "chrome/browser/extensions/app_sync_data.h" |
| 13 #include "chrome/browser/extensions/extension_error_ui.h" | 13 #include "chrome/browser/extensions/extension_error_ui.h" |
| 14 #include "chrome/browser/extensions/extension_service.h" | 14 #include "chrome/browser/extensions/extension_service.h" |
| 15 #include "chrome/browser/extensions/extension_sync_data.h" | 15 #include "chrome/browser/extensions/extension_sync_data.h" |
| 16 #include "chrome/browser/extensions/extension_sync_service_factory.h" | 16 #include "chrome/browser/extensions/extension_sync_service_factory.h" |
| 17 #include "chrome/browser/extensions/extension_util.h" | 17 #include "chrome/browser/extensions/extension_util.h" |
| 18 #include "chrome/browser/extensions/launch_util.h" | 18 #include "chrome/browser/extensions/launch_util.h" |
| 19 #include "chrome/browser/profiles/profile.h" | 19 #include "chrome/browser/profiles/profile.h" |
| 20 #include "chrome/browser/sync/glue/sync_start_util.h" | 20 #include "chrome/browser/sync/glue/sync_start_util.h" |
| 21 #include "chrome/browser/sync/sync_prefs.h" | |
| 22 #include "chrome/common/extensions/sync_helper.h" | 21 #include "chrome/common/extensions/sync_helper.h" |
| 22 #include "components/sync_driver/sync_prefs.h" |
| 23 #include "extensions/browser/app_sorting.h" | 23 #include "extensions/browser/app_sorting.h" |
| 24 #include "extensions/browser/extension_prefs.h" | 24 #include "extensions/browser/extension_prefs.h" |
| 25 #include "extensions/browser/extension_registry.h" | 25 #include "extensions/browser/extension_registry.h" |
| 26 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
| 27 #include "extensions/common/feature_switch.h" | 27 #include "extensions/common/feature_switch.h" |
| 28 #include "extensions/common/manifest_constants.h" | 28 #include "extensions/common/manifest_constants.h" |
| 29 #include "sync/api/sync_change.h" | 29 #include "sync/api/sync_change.h" |
| 30 #include "sync/api/sync_error_factory.h" | 30 #include "sync/api/sync_error_factory.h" |
| 31 | 31 |
| 32 using extensions::Extension; | 32 using extensions::Extension; |
| 33 using extensions::ExtensionPrefs; | 33 using extensions::ExtensionPrefs; |
| 34 using extensions::ExtensionRegistry; | 34 using extensions::ExtensionRegistry; |
| 35 using extensions::FeatureSwitch; | 35 using extensions::FeatureSwitch; |
| 36 | 36 |
| 37 ExtensionSyncService::ExtensionSyncService(Profile* profile, | 37 ExtensionSyncService::ExtensionSyncService(Profile* profile, |
| 38 ExtensionPrefs* extension_prefs, | 38 ExtensionPrefs* extension_prefs, |
| 39 ExtensionService* extension_service) | 39 ExtensionService* extension_service) |
| 40 : profile_(profile), | 40 : profile_(profile), |
| 41 extension_prefs_(extension_prefs), | 41 extension_prefs_(extension_prefs), |
| 42 extension_service_(extension_service), | 42 extension_service_(extension_service), |
| 43 app_sync_bundle_(this), | 43 app_sync_bundle_(this), |
| 44 extension_sync_bundle_(this), | 44 extension_sync_bundle_(this), |
| 45 pending_app_enables_( | 45 pending_app_enables_(make_scoped_ptr(new sync_driver::SyncPrefs( |
| 46 make_scoped_ptr(new browser_sync::SyncPrefs( | 46 extension_prefs_->pref_service())), |
| 47 extension_prefs_->pref_service())), | 47 &app_sync_bundle_, |
| 48 &app_sync_bundle_, | 48 syncer::APPS), |
| 49 syncer::APPS), | 49 pending_extension_enables_(make_scoped_ptr(new sync_driver::SyncPrefs( |
| 50 pending_extension_enables_( | 50 extension_prefs_->pref_service())), |
| 51 make_scoped_ptr(new browser_sync::SyncPrefs( | 51 &extension_sync_bundle_, |
| 52 extension_prefs_->pref_service())), | 52 syncer::EXTENSIONS) { |
| 53 &extension_sync_bundle_, | |
| 54 syncer::EXTENSIONS) { | |
| 55 SetSyncStartFlare(sync_start_util::GetFlareForSyncableService( | 53 SetSyncStartFlare(sync_start_util::GetFlareForSyncableService( |
| 56 profile_->GetPath())); | 54 profile_->GetPath())); |
| 57 | 55 |
| 58 extension_service_->set_extension_sync_service(this); | 56 extension_service_->set_extension_sync_service(this); |
| 59 extension_prefs_->app_sorting()->SetExtensionSyncService(this); | 57 extension_prefs_->app_sorting()->SetExtensionSyncService(this); |
| 60 } | 58 } |
| 61 | 59 |
| 62 ExtensionSyncService::~ExtensionSyncService() {} | 60 ExtensionSyncService::~ExtensionSyncService() {} |
| 63 | 61 |
| 64 // static | 62 // static |
| (...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 455 app_sync_bundle_.SyncChangeIfNeeded(extension); | 453 app_sync_bundle_.SyncChangeIfNeeded(extension); |
| 456 else if (extension_service_->is_ready() && !flare_.is_null()) | 454 else if (extension_service_->is_ready() && !flare_.is_null()) |
| 457 flare_.Run(syncer::APPS); | 455 flare_.Run(syncer::APPS); |
| 458 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) { | 456 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) { |
| 459 if (extension_sync_bundle_.IsSyncing()) | 457 if (extension_sync_bundle_.IsSyncing()) |
| 460 extension_sync_bundle_.SyncChangeIfNeeded(extension); | 458 extension_sync_bundle_.SyncChangeIfNeeded(extension); |
| 461 else if (extension_service_->is_ready() && !flare_.is_null()) | 459 else if (extension_service_->is_ready() && !flare_.is_null()) |
| 462 flare_.Run(syncer::EXTENSIONS); | 460 flare_.Run(syncer::EXTENSIONS); |
| 463 } | 461 } |
| 464 } | 462 } |
| OLD | NEW |