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

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

Issue 7564037: Apps/Extensions Sync refactoring -- delete most of the old glue, implement new sync API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes for Review Comments Created 9 years, 4 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/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 1b623538d0ce3e7064f8213bb0938268844e8943..f0924841a2cf8088b233f4f122e335e7e9a1b5c3 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -282,7 +282,7 @@ Extension::Location Extension::GetHigherPriorityLocation(
// deterministicly choose a location.
CHECK(loc1_rank != loc2_rank);
- // Lowest rank has highest priority.
+ // Highest rank has highest priority.
return (loc1_rank > loc2_rank ? loc1 : loc2 );
}
@@ -2824,6 +2824,52 @@ bool Extension::OverlapsWithOrigin(const GURL& origin) const {
return web_extent().OverlapsWith(origin_only_pattern_list);
}
+Extension::SyncType Extension::GetSyncType() const {
+ // TODO(akalin): Figure out if we need to allow some other types.
+ if (location() != Extension::INTERNAL) {
+ // We have a non-standard location.
+ return SYNC_TYPE_NONE;
+ }
+
+ // Disallow extensions with non-gallery auto-update URLs for now.
+ //
+ // TODO(akalin): Relax this restriction once we've put in UI to
+ // approve synced extensions.
+ if (!update_url().is_empty() &&
+ (update_url() != GalleryUpdateUrl(false)) &&
+ (update_url() != GalleryUpdateUrl(true))) {
+ return SYNC_TYPE_NONE;
+ }
+
+ // Disallow extensions with native code plugins.
+ //
+ // TODO(akalin): Relax this restriction once we've put in UI to
+ // approve synced extensions.
+ if (!plugins().empty()) {
+ return SYNC_TYPE_NONE;
+ }
+
+ switch (GetType()) {
+ case Extension::TYPE_EXTENSION:
+ return SYNC_TYPE_EXTENSION;
+
+ case Extension::TYPE_USER_SCRIPT:
+ // We only want to sync user scripts with gallery update URLs.
+ if (update_url() == GalleryUpdateUrl(true) ||
+ update_url() == GalleryUpdateUrl(false))
+ return SYNC_TYPE_EXTENSION;
+ else
+ return SYNC_TYPE_NONE;
+
+ case Extension::TYPE_HOSTED_APP:
+ case Extension::TYPE_PACKAGED_APP:
+ return SYNC_TYPE_APP;
+
+ default:
+ return SYNC_TYPE_NONE;
+ }
+}
+
ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
const std::string& id,
const FilePath& path,

Powered by Google App Engine
This is Rietveld 408576698