diff options
| author | brettw <brettw@chromium.org> | 2016-01-22 16:46:38 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-23 00:48:00 +0000 |
| commit | b65cd5c1a3b0d3fa5700d808afeb111d2f0ef2d0 (patch) | |
| tree | 8a8616add122edddfb82cc8fcedb865e31fffc77 /chrome/browser/chrome_content_browser_client.cc | |
| parent | b47b47617273a91db8fd74c357a756cd189a4342 (diff) | |
| download | chromium_src-b65cd5c1a3b0d3fa5700d808afeb111d2f0ef2d0.zip chromium_src-b65cd5c1a3b0d3fa5700d808afeb111d2f0ef2d0.tar.gz chromium_src-b65cd5c1a3b0d3fa5700d808afeb111d2f0ef2d0.tar.bz2 | |
Convert some URL accessors to use StringPieces
Updates some google util, registry controlled domain, and net util code to
use string pieces in their APIs.
Convert some google util functions to take a const ref GURL instead of a copy.
Review URL: https://codereview.chromium.org/1614223003
Cr-Commit-Position: refs/heads/master@{#371101}
Diffstat (limited to 'chrome/browser/chrome_content_browser_client.cc')
| -rw-r--r-- | chrome/browser/chrome_content_browser_client.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index b3cdde7..4ef4c6f 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -384,7 +384,9 @@ GURL ReplaceURLHostAndPath(const GURL& url, // Maps "foo://bar/baz/" to "foo://chrome/bar/baz/". GURL AddUberHost(const GURL& url) { const std::string uber_host = chrome::kChromeUIUberHost; - const std::string new_path = url.host() + url.path(); + std::string new_path; + url.host_piece().AppendToString(&new_path); + url.path_piece().AppendToString(&new_path); return ReplaceURLHostAndPath(url, uber_host, new_path); } @@ -1118,7 +1120,7 @@ bool ChromeContentBrowserClient::ShouldAllowOpenURL( // the signin page may host untrusted web content. if (from_url.GetOrigin().spec() == chrome::kChromeUIChromeSigninURL && url.SchemeIs(content::kChromeUIScheme) && - url.host() != chrome::kChromeUIChromeSigninHost) { + url.host_piece() != chrome::kChromeUIChromeSigninHost) { VLOG(1) << "Blocked navigation to " << url.spec() << " from " << chrome::kChromeUIChromeSigninURL; return false; |
