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

Unified Diff: chrome/common/extensions/sync_helper.cc

Issue 16816024: Fix syncing of NPAPI plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 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
« no previous file with comments | « no previous file | chrome/common/extensions/sync_type_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/sync_helper.cc
diff --git a/chrome/common/extensions/sync_helper.cc b/chrome/common/extensions/sync_helper.cc
index 3cffcca357f1813b17dbe5756784133c71933d9b..c839adc4e31ed1ed859849bbf9689b0b95b37cbb 100644
--- a/chrome/common/extensions/sync_helper.cc
+++ b/chrome/common/extensions/sync_helper.cc
@@ -41,8 +41,10 @@ SyncType GetSyncType(const Extension* extension) {
//
// TODO(akalin): Relax this restriction once we've put in UI to
// approve synced extensions.
- if (PluginInfo::HasPlugins(extension))
+ if (PluginInfo::HasPlugins(extension) ||
+ extension->HasAPIPermission(APIPermission::kPlugin)) {
return SYNC_TYPE_NONE;
+ }
switch (extension->GetType()) {
case Manifest::TYPE_EXTENSION:
« no previous file with comments | « no previous file | chrome/common/extensions/sync_type_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698