| Index: chrome/browser/extensions/app_sync_bundle.cc
|
| diff --git a/chrome/browser/extensions/app_sync_bundle.cc b/chrome/browser/extensions/app_sync_bundle.cc
|
| index 33a397d3b4f76515c33e99d726c28c58e0dc8d9a..69a5db6c656b120274af25b1170fd2f5c73afb53 100644
|
| --- a/chrome/browser/extensions/app_sync_bundle.cc
|
| +++ b/chrome/browser/extensions/app_sync_bundle.cc
|
| @@ -6,6 +6,8 @@
|
|
|
| #include "base/location.h"
|
| #include "chrome/browser/extensions/extension_sync_service.h"
|
| +#include "chrome/browser/extensions/extension_util.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/extensions/sync_helper.h"
|
| #include "extensions/browser/app_sorting.h"
|
| #include "extensions/common/extension.h"
|
| @@ -141,13 +143,15 @@ std::vector<AppSyncData> AppSyncBundle::GetPendingData() const {
|
| void AppSyncBundle::GetAppSyncDataListHelper(
|
| const ExtensionSet& extensions,
|
| std::vector<AppSyncData>* sync_data_list) const {
|
| + Profile* profile = extension_sync_service_->profile();
|
| +
|
| for (ExtensionSet::const_iterator it = extensions.begin();
|
| it != extensions.end(); ++it) {
|
| const Extension& extension = *it->get();
|
| // If we have pending app data for this app, then this
|
| // version is out of date. We'll sync back the version we got from
|
| // sync.
|
| - if (IsSyncing() && sync_helper::IsSyncableApp(&extension) &&
|
| + if (IsSyncing() && util::ShouldSyncApp(&extension, profile) &&
|
| !HasPendingExtensionId(extension.id())) {
|
| sync_data_list->push_back(extension_sync_service_->GetAppSyncData(
|
| extension));
|
|
|