diff options
author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:06:38 +0000 |
---|---|---|
committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:06:38 +0000 |
commit | 4a5fe3e214681129ec12208e92f33a0fd3be2037 (patch) | |
tree | f4767a1a68b5524ddfddbc7ce6ee31b8b2d36345 /chrome/common/extensions/extension.cc | |
parent | 2b26c2fb712cf1f1094e20730863b8be73bfc116 (diff) | |
download | chromium_src-4a5fe3e214681129ec12208e92f33a0fd3be2037.zip chromium_src-4a5fe3e214681129ec12208e92f33a0fd3be2037.tar.gz chromium_src-4a5fe3e214681129ec12208e92f33a0fd3be2037.tar.bz2 |
Move Extension::UpdatesFromGallery to ManifestURL.
BUG=162530
TBR=jhawkins@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203886 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension.cc')
-rw-r--r-- | chrome/common/extensions/extension.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 720d8cf..c9197c2 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -424,10 +424,6 @@ GURL Extension::GetFullLaunchURL() const { url().Resolve(launch_local_path()); } -bool Extension::UpdatesFromGallery() const { - return extension_urls::IsWebstoreUpdateUrl(ManifestURL::GetUpdateURL(this)); -} - bool Extension::OverlapsWithOrigin(const GURL& origin) const { if (url() == origin) return true; @@ -458,7 +454,8 @@ Extension::SyncType Extension::GetSyncType() const { // // TODO(akalin): Relax this restriction once we've put in UI to // approve synced extensions. - if (!ManifestURL::GetUpdateURL(this).is_empty() && !UpdatesFromGallery()) + if (!ManifestURL::GetUpdateURL(this).is_empty() && + !ManifestURL::UpdatesFromGallery(this)) return SYNC_TYPE_NONE; // Disallow extensions with native code plugins. @@ -474,7 +471,7 @@ Extension::SyncType Extension::GetSyncType() const { case Manifest::TYPE_USER_SCRIPT: // We only want to sync user scripts with gallery update URLs. - if (UpdatesFromGallery()) + if (ManifestURL::UpdatesFromGallery(this)) return SYNC_TYPE_EXTENSION; else return SYNC_TYPE_NONE; |