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

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

Issue 1200833004: Apps&Extensions for Supervised Users: send permission request on outdated re-enables (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 6 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
Index: chrome/browser/extensions/extension_sync_bundle.cc
diff --git a/chrome/browser/extensions/extension_sync_bundle.cc b/chrome/browser/extensions/extension_sync_bundle.cc
index 61ec1173532d5242c54099ae788d496e87670568..91634748c7c1044c4bb238a831b7677d175daa06 100644
--- a/chrome/browser/extensions/extension_sync_bundle.cc
+++ b/chrome/browser/extensions/extension_sync_bundle.cc
@@ -122,6 +122,11 @@ bool ExtensionSyncBundle::IsSyncing() const {
}
void ExtensionSyncBundle::SyncChangeIfNeeded(const Extension& extension) {
+ // If there is a pending update for this extension, apply it first.
+ auto it = pending_sync_data_.find(extension.id());
+ if (it != pending_sync_data_.end())
+ ProcessSyncChange(it->second);
Marc Treib 2015/06/22 15:35:18 It sucks that this code is duplicated in app_sync_
+
ExtensionSyncData extension_sync_data =
extension_sync_service_->GetExtensionSyncData(extension);

Powered by Google App Engine
This is Rietveld 408576698