Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2997)

Unified Diff: chrome/browser/extensions/app_sync_bundle.cc

Issue 295203002: Fixed sync regression for ephemeral apps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698