| commit | 6534806358ab53fae0f7550d4d83700bd9773341 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Tue Jan 15 07:27:22 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Tue Jan 15 07:27:22 2013 |
| tree | a71cbaad6fc1f2e9c1f3fd1431af19c0178b76ec | |
| parent | cbecfa5f3d14e2ea47f8404ca12f40e3b9efcc88 [diff] [blame] |
Move the parsing of 'update_url' & 'options_page' URLs out of Extension. This CL follows https://codereview.chromium.org/11624036/ Patch from Joe Thomas <[email protected]>. BUG=159265 Review URL: https://chromiumcodereview.appspot.com/11726002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176824 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc index cb80c65..867d6299a 100644 --- a/chrome/browser/extensions/extension_service.cc +++ b/chrome/browser/extensions/extension_service.cc
@@ -88,6 +88,7 @@ #include "chrome/common/extensions/feature_switch.h" #include "chrome/common/extensions/features/feature.h" #include "chrome/common/extensions/manifest.h" +#include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_thread.h" @@ -2339,7 +2340,8 @@ LOG(WARNING) << "ShouldAllowInstall() returned false for " << id << " of type " << extension->GetType() - << " and update URL " << extension->update_url().spec() + << " and update URL " + << extensions::ManifestURL::GetUpdateURL(extension).spec() << "; not installing"; content::NotificationService::current()->Notify(