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

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

Issue 65983002: Revert 231221 - "Remove enabled/disabled state from extension and app sync." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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_service.cc
diff --git a/chrome/browser/extensions/extension_sync_service.cc b/chrome/browser/extensions/extension_sync_service.cc
index 5adab024d6d55450c2057f7e3f9e8326f2edf685..b69a1a4fa983cbf3e5cd189897be9997b9664141 100644
--- a/chrome/browser/extensions/extension_sync_service.cc
+++ b/chrome/browser/extensions/extension_sync_service.cc
@@ -382,6 +382,15 @@ bool ExtensionSyncService::ProcessExtensionSyncDataHelper(
}
// Set user settings.
+ // If the extension has been disabled from sync, it may not have
+ // been installed yet, so we don't know if the disable reason was a
+ // permissions increase. That will be updated once CheckPermissionsIncrease
+ // is called for it.
+ if (extension_sync_data.enabled())
+ extension_service_->EnableExtension(id);
+ else if (!IsPendingEnable(id))
+ extension_service_->DisableExtension(
+ id, Extension::DISABLE_UNKNOWN_FROM_SYNC);
// We need to cache some version information here because setting the
// incognito flag invalidates the |extension| pointer (it reloads the
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/sync/test/integration/apps_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698