diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 02:16:13 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-20 02:16:13 +0000 |
commit | e288840fb5acf7336568ea37527d2189c8733ae8 (patch) | |
tree | 1b349cf3b3e895d99defa2d7effe2d43707c8474 /chrome/common | |
parent | 2eba1513ea24399e08de0836ce622d383e4606b8 (diff) | |
download | chromium_src-e288840fb5acf7336568ea37527d2189c8733ae8.zip chromium_src-e288840fb5acf7336568ea37527d2189c8733ae8.tar.gz chromium_src-e288840fb5acf7336568ea37527d2189c8733ae8.tar.bz2 |
Special case the gallery to not show the scary download roadblock.
That was only needed because of clickjacking.
BUG=28227
Review URL: http://codereview.chromium.org/411004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/extensions/extension.cc | 3 | ||||
-rw-r--r-- | chrome/common/extensions/extension.h | 3 | ||||
-rw-r--r-- | chrome/common/extensions/extension_constants.cc | 8 | ||||
-rw-r--r-- | chrome/common/extensions/extension_constants.h | 12 |
4 files changed, 20 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index 7b39253..93428a58 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -86,9 +86,6 @@ static const wchar_t* kValidThemeKeys[] = { keys::kUpdateURL }; -const char* Extension::kGalleryBrowseUrl = - "https://chrome.google.com/extensions"; - #if defined(OS_WIN) const char* Extension::kExtensionRegistryPath = "Software\\Google\\Chrome\\Extensions"; diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h index 7738acf..9d5c1f5 100644 --- a/chrome/common/extensions/extension.h +++ b/chrome/common/extensions/extension.h @@ -63,9 +63,6 @@ class Extension { EXTENSION_ICON_BITTY = 16, }; - // The URL to browse the extensions gallery. - static const char* kGalleryBrowseUrl; - // Icon sizes used by the extension system. static const int kIconSizes[]; diff --git a/chrome/common/extensions/extension_constants.cc b/chrome/common/extensions/extension_constants.cc index 733b4f8..efba4d3 100644 --- a/chrome/common/extensions/extension_constants.cc +++ b/chrome/common/extensions/extension_constants.cc @@ -195,3 +195,11 @@ const char* kLocalesMessagesFileMissing = const char* kInvalidOptionsPage = "Invalid value for 'options_page'."; } // namespace extension_manifest_errors + +namespace extension_urls { +const char* kGalleryBrowsePrefix = "https://chrome.google.com/extensions"; +const char* kGalleryDownloadPrefix = + "https://clients2.googleusercontent.com/crx/download"; +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 c8a717a..8d2500a 100644 --- a/chrome/common/extensions/extension_constants.h +++ b/chrome/common/extensions/extension_constants.h @@ -130,4 +130,16 @@ namespace extension_manifest_errors { extern const char* kInvalidOptionsPage; } // namespace extension_manifest_errors +namespace extension_urls { + // The greatest common prefixes of the main extensions gallery's browse and + // download URLs. + extern const char* kGalleryBrowsePrefix; + extern const char* kGalleryDownloadPrefix; + + // Same thing for the "minigallery". The minigallery is the temporary static + // themes gallery that we put up when we launched themes. + extern const char* kMiniGalleryBrowsePrefix; + extern const char* kMiniGalleryDownloadPrefix; +} // namespace extension_urls + #endif // CHROME_COMMON_EXTENSIONS_EXTENSION_CONSTANTS_H_ |