| 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" | 21 #include "chrome/browser/sync/sync_prefs.h" |
| 22 #include "chrome/common/extensions/sync_helper.h" | 22 #include "chrome/common/extensions/sync_helper.h" |
| 23 #include "content/public/browser/browser_thread.h" | |
| 24 #include "extensions/browser/app_sorting.h" | 23 #include "extensions/browser/app_sorting.h" |
| 25 #include "extensions/browser/extension_prefs.h" | 24 #include "extensions/browser/extension_prefs.h" |
| 26 #include "extensions/browser/extension_registry.h" | 25 #include "extensions/browser/extension_registry.h" |
| 27 #include "extensions/common/extension.h" | 26 #include "extensions/common/extension.h" |
| 28 #include "extensions/common/feature_switch.h" | 27 #include "extensions/common/feature_switch.h" |
| 29 #include "extensions/common/manifest_constants.h" | 28 #include "extensions/common/manifest_constants.h" |
| 30 #include "sync/api/sync_change.h" | 29 #include "sync/api/sync_change.h" |
| 31 #include "sync/api/sync_error_factory.h" | 30 #include "sync/api/sync_error_factory.h" |
| 32 | 31 |
| 33 using extensions::Extension; | 32 using extensions::Extension; |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 | 236 |
| 238 extensions::AppSyncData ExtensionSyncService::GetAppSyncData( | 237 extensions::AppSyncData ExtensionSyncService::GetAppSyncData( |
| 239 const Extension& extension) const { | 238 const Extension& extension) const { |
| 240 return extensions::AppSyncData( | 239 return extensions::AppSyncData( |
| 241 extension, | 240 extension, |
| 242 extension_service_->IsExtensionEnabled(extension.id()), | 241 extension_service_->IsExtensionEnabled(extension.id()), |
| 243 extensions::util::IsIncognitoEnabled(extension.id(), profile_), | 242 extensions::util::IsIncognitoEnabled(extension.id(), profile_), |
| 244 extension_prefs_->app_sorting()->GetAppLaunchOrdinal(extension.id()), | 243 extension_prefs_->app_sorting()->GetAppLaunchOrdinal(extension.id()), |
| 245 extension_prefs_->app_sorting()->GetPageOrdinal(extension.id()), | 244 extension_prefs_->app_sorting()->GetPageOrdinal(extension.id()), |
| 246 extensions::GetLaunchTypePrefValue(extension_prefs_, extension.id())); | 245 extensions::GetLaunchTypePrefValue(extension_prefs_, extension.id())); |
| 247 | |
| 248 } | 246 } |
| 249 | 247 |
| 250 std::vector<extensions::ExtensionSyncData> | 248 std::vector<extensions::ExtensionSyncData> |
| 251 ExtensionSyncService::GetExtensionSyncDataList() const { | 249 ExtensionSyncService::GetExtensionSyncDataList() const { |
| 252 ExtensionRegistry* registry = ExtensionRegistry::Get(profile_); | 250 ExtensionRegistry* registry = ExtensionRegistry::Get(profile_); |
| 253 std::vector<extensions::ExtensionSyncData> extension_sync_list; | 251 std::vector<extensions::ExtensionSyncData> extension_sync_list; |
| 254 extension_sync_bundle_.GetExtensionSyncDataListHelper( | 252 extension_sync_bundle_.GetExtensionSyncDataListHelper( |
| 255 registry->enabled_extensions(), &extension_sync_list); | 253 registry->enabled_extensions(), &extension_sync_list); |
| 256 extension_sync_bundle_.GetExtensionSyncDataListHelper( | 254 extension_sync_bundle_.GetExtensionSyncDataListHelper( |
| 257 registry->disabled_extensions(), &extension_sync_list); | 255 registry->disabled_extensions(), &extension_sync_list); |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 app_sync_bundle_.SyncChangeIfNeeded(extension); | 455 app_sync_bundle_.SyncChangeIfNeeded(extension); |
| 458 else if (extension_service_->is_ready() && !flare_.is_null()) | 456 else if (extension_service_->is_ready() && !flare_.is_null()) |
| 459 flare_.Run(syncer::APPS); | 457 flare_.Run(syncer::APPS); |
| 460 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) { | 458 } else if (extensions::sync_helper::IsSyncableExtension(&extension)) { |
| 461 if (extension_sync_bundle_.IsSyncing()) | 459 if (extension_sync_bundle_.IsSyncing()) |
| 462 extension_sync_bundle_.SyncChangeIfNeeded(extension); | 460 extension_sync_bundle_.SyncChangeIfNeeded(extension); |
| 463 else if (extension_service_->is_ready() && !flare_.is_null()) | 461 else if (extension_service_->is_ready() && !flare_.is_null()) |
| 464 flare_.Run(syncer::EXTENSIONS); | 462 flare_.Run(syncer::EXTENSIONS); |
| 465 } | 463 } |
| 466 } | 464 } |
| OLD | NEW |