Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1575)

Unified Diff: chrome/browser/ui/webui/devtools_ui.cc

Issue 2481923002: [WIP] make GURL::path() return a StringPiece (Closed)
Patch Set: thanks asan Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/devtools_ui.cc
diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc
index e16afaaa3a624c4a5fe7c6870b71679a5d01e9f6..033349ad256879d879086b90bdaf4402aa8efd49 100644
--- a/chrome/browser/ui/webui/devtools_ui.cc
+++ b/chrome/browser/ui/webui/devtools_ui.cc
@@ -35,7 +35,9 @@ namespace {
std::string PathWithoutParams(const std::string& path) {
return GURL(std::string("chrome-devtools://devtools/") + path)
- .path().substr(1);
+ .path()
+ .substr(1)
+ .as_string();
}
const char kRemoteFrontendDomain[] = "chrome-devtools-frontend.appspot.com";
@@ -95,7 +97,7 @@ std::string SanitizeEndpoint(const std::string& value) {
std::string SanitizeRemoteBase(const std::string& value) {
GURL url(value);
- std::string path = url.path();
+ std::string path = url.path().as_string();
std::vector<std::string> parts = base::SplitString(
path, "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
std::string revision = parts.size() > 2 ? parts[2] : "";
@@ -110,7 +112,7 @@ std::string SanitizeRemoteFrontendURL(const std::string& value) {
net::UnescapeRule::SPACES | net::UnescapeRule::PATH_SEPARATORS |
net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS |
net::UnescapeRule::REPLACE_PLUS_WITH_SPACE));
- std::string path = url.path();
+ std::string path = url.path().as_string();
std::vector<std::string> parts = base::SplitString(
path, "/", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
std::string revision = parts.size() > 2 ? parts[2] : "";
@@ -407,11 +409,10 @@ GURL DevToolsUI::GetProxyURL(const std::string& frontend_url) {
GURL url(frontend_url);
if (!url.is_valid() || url.host() != kRemoteFrontendDomain)
return GURL(kFallbackFrontendURL);
- return GURL(base::StringPrintf("%s://%s/%s/%s",
- content::kChromeDevToolsScheme,
- chrome::kChromeUIDevToolsHost,
- chrome::kChromeUIDevToolsRemotePath,
- url.path().substr(1).c_str()));
+ return GURL(base::StringPrintf(
+ "%s://%s/%s/%s", content::kChromeDevToolsScheme,
+ chrome::kChromeUIDevToolsHost, chrome::kChromeUIDevToolsRemotePath,
+ url.path().substr(1).as_string().c_str()));
}
// static
@@ -425,8 +426,9 @@ GURL DevToolsUI::GetRemoteBaseURL() {
// static
GURL DevToolsUI::SanitizeFrontendURL(const GURL& url) {
- return ::SanitizeFrontendURL(url, content::kChromeDevToolsScheme,
- chrome::kChromeUIDevToolsHost, SanitizeFrontendPath(url.path()), true);
+ return ::SanitizeFrontendURL(
+ url, content::kChromeDevToolsScheme, chrome::kChromeUIDevToolsHost,
+ SanitizeFrontendPath(url.path().as_string()), true);
}
DevToolsUI::DevToolsUI(content::WebUI* web_ui)
« no previous file with comments | « chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc ('k') | chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698