summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 21:23:26 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-20 21:23:26 +0000
commit501887fdc181ddfce88c60f075551538136c7546 (patch)
tree90f1ad77f233aed7a0916d460da263927a71e54d /chrome/common
parent5d0c60c865e8c3f5414bbe4f571245471b8e21a0 (diff)
downloadchromium_src-501887fdc181ddfce88c60f075551538136c7546.zip
chromium_src-501887fdc181ddfce88c60f075551538136c7546.tar.gz
chromium_src-501887fdc181ddfce88c60f075551538136c7546.tar.bz2
Disallow syncing of extensions with third-party update URLs or plugins.
BUG=49346,46516 TEST=new unit tests, manual Review URL: http://codereview.chromium.org/2884025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53102 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/extension_constants.cc4
-rw-r--r--chrome/common/extensions/extension_constants.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc
index 8bfa434..989d449 100644
--- a/chrome/common/extensions/extension_constants.cc
+++ b/chrome/common/extensions/extension_constants.cc
@@ -263,8 +263,10 @@ namespace extension_urls {
const char* kGalleryBrowsePrefix = "https://chrome.google.com/extensions";
const char* kGalleryDownloadPrefix =
"https://clients2.googleusercontent.com/crx/download";
-const char* kGalleryUpdateURL =
+const char* kGalleryUpdateHttpUrl =
"http://clients2.google.com/service/update2/crx";
+const char* kGalleryUpdateHttpsUrl =
+ "https://clients2.google.com/service/update2/crx";
const char* kMiniGalleryBrowsePrefix = "https://tools.google.com/chrome/";
const char* kMiniGalleryDownloadPrefix = "https://dl-ssl.google.com/chrome/";
}
diff --git a/chrome/common/extensions/extension_constants.h b/chrome/common/extensions/extension_constants.h
index a8d508daf..007c3a0 100644
--- a/chrome/common/extensions/extension_constants.h
+++ b/chrome/common/extensions/extension_constants.h
@@ -177,8 +177,9 @@ namespace extension_urls {
extern const char* kGalleryBrowsePrefix;
extern const char* kGalleryDownloadPrefix;
- // The update url used by gallery/webstore extensions.
- extern const char* kGalleryUpdateURL;
+ // The update urls used by gallery/webstore extensions.
+ extern const char* kGalleryUpdateHttpUrl;
+ extern const char* kGalleryUpdateHttpsUrl;
// Same thing for the "minigallery". The minigallery is the temporary static
// themes gallery that we put up when we launched themes.