diff options
| author | msramek <msramek@chromium.org> | 2015-08-18 06:04:19 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-18 13:05:06 +0000 |
| commit | 9b7972dd82ae09d1d1c38c6078bc384759eb18ee (patch) | |
| tree | 2aaaec212da3f07d6e37340e03f384d66b172530 /extensions/shell | |
| parent | ed9b2a0e8440ce2ff16b4ed043bad27a995a39c6 (diff) | |
| download | chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.zip chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.tar.gz chromium_src-9b7972dd82ae09d1d1c38c6078bc384759eb18ee.tar.bz2 | |
Revert of Allow url::SchemeHostPort to hold non-file scheme without port (patchset #16 id:320001 of https://codereview.chromium.org/1272113002/ )
Reason for revert:
Broken build.
http://build.chromium.org/p/chromium.mac/builders/iOS_Device_%28ninja%29/builds/17899/steps/compile/logs/stdio
Original issue's description:
> Allow url::SchemeHostPort to hold non-file scheme without port
>
> WebSockets use url::Origin to pass origin info between renderer and
> browser. Currently, it cannot hold an origin with non-file scheme and
> no port. Chrome extensions have been using such origins, so we need
> to keep the channel to convey origin info work for such origins.
>
> BUG=516971
> R=sleevi,brettw
>
> Committed: https://crrev.com/1ac9ec7bccd1b5178b18338b10149f36292f5fb6
> Cr-Commit-Position: refs/heads/master@{#343895}
TBR=rsleevi@chromium.org,mkwst@chromium.org,brettw@chromium.org,tyoshino@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=516971
Review URL: https://codereview.chromium.org/1301563003
Cr-Commit-Position: refs/heads/master@{#343898}
Diffstat (limited to 'extensions/shell')
| -rw-r--r-- | extensions/shell/common/shell_content_client.cc | 14 | ||||
| -rw-r--r-- | extensions/shell/common/shell_content_client.h | 3 |
2 files changed, 4 insertions, 13 deletions
diff --git a/extensions/shell/common/shell_content_client.cc b/extensions/shell/common/shell_content_client.cc index 946fe83..1879a8f 100644 --- a/extensions/shell/common/shell_content_client.cc +++ b/extensions/shell/common/shell_content_client.cc @@ -74,20 +74,12 @@ void ShellContentClient::AddPepperPlugins( #endif // !defined(DISABLE_NACL) } -static const int kNumShellStandardURLSchemes = 2; -static const url::SchemeWithType kShellStandardURLSchemes[ - kNumShellStandardURLSchemes] = { - {extensions::kExtensionScheme, url::SCHEME_WITHOUT_PORT}, - {extensions::kExtensionResourceScheme, url::SCHEME_WITHOUT_PORT}, -}; - void ShellContentClient::AddAdditionalSchemes( - std::vector<url::SchemeWithType>* standard_schemes, + std::vector<std::string>* standard_schemes, std::vector<std::string>* savable_schemes) { - for (int i = 0; i < kNumShellStandardURLSchemes; i++) - standard_schemes->push_back(kShellStandardURLSchemes[i]); - + standard_schemes->push_back(kExtensionScheme); savable_schemes->push_back(kExtensionScheme); + standard_schemes->push_back(kExtensionResourceScheme); savable_schemes->push_back(kExtensionResourceScheme); } diff --git a/extensions/shell/common/shell_content_client.h b/extensions/shell/common/shell_content_client.h index f105511..4e0e384 100644 --- a/extensions/shell/common/shell_content_client.h +++ b/extensions/shell/common/shell_content_client.h @@ -8,7 +8,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "content/public/common/content_client.h" -#include "url/url_util.h" namespace extensions { @@ -19,7 +18,7 @@ class ShellContentClient : public content::ContentClient { void AddPepperPlugins( std::vector<content::PepperPluginInfo>* plugins) override; - void AddAdditionalSchemes(std::vector<url::SchemeWithType>* standard_schemes, + void AddAdditionalSchemes(std::vector<std::string>* standard_schemes, std::vector<std::string>* saveable_shemes) override; std::string GetUserAgent() const override; base::string16 GetLocalizedString(int message_id) const override; |