diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 01:07:46 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-07 01:07:46 +0000 |
| commit | 7d8b707e12ac0a18491c2810269167226cd95deb (patch) | |
| tree | da56d35172fcccb7171fd1cf2ad5bd17139781d2 | |
| parent | 5211222c4af5724a78819eca0dbae1dd0eb724d1 (diff) | |
| download | chromium_src-7d8b707e12ac0a18491c2810269167226cd95deb.zip chromium_src-7d8b707e12ac0a18491c2810269167226cd95deb.tar.gz chromium_src-7d8b707e12ac0a18491c2810269167226cd95deb.tar.bz2 | |
Apps that get updated from the Webstore should be considered WebStore apps.
BUG=internal
TEST=none
Review URL: http://codereview.chromium.org/10006018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131223 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_service.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index 4a27f8c..a57a247 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc @@ -645,12 +645,14 @@ bool ExtensionService::UpdateExtension( installer->set_install_source(extension->location()); if (pending_extension_info.install_silently()) installer->set_allow_silent_install(true); - // If the extension came from sync and its auto-update URL is from the + // If the extension was installed from or has migrated to the webstore, or + // if the extension came from sync and its auto-update URL is from the // webstore, treat it as a webstore install. Note that we ignore some older // extensions with blank auto-update URLs because we are mostly concerned // with restrictions on NaCl extensions, which are newer. int creation_flags = Extension::NO_FLAGS; if ((extension && extension->from_webstore()) || + (extension && extension->UpdatesFromGallery()) || (!extension && pending_extension_info.is_from_sync() && extension_urls::IsWebstoreUpdateUrl( pending_extension_info.update_url()))) { |