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

Unified Diff: chrome/browser/devtools/devtools_window.cc

Issue 1144393004: [DevTools] Load DevTools frontend without iframe (chromium part). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-test
Patch Set: Addressed review comments Created 5 years, 7 months 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
« no previous file with comments | « no previous file | chrome/common/url_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_window.cc
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 744cf0ee0e4b121e2c0becdc20bfc41286baaa92..04d9c8065c9ae25f9731e3d037a503d36eab0ca7 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -756,7 +756,9 @@ GURL DevToolsWindow::GetDevToolsURL(Profile* profile,
return base_url;
std::string frontend_url(
- base_url.is_empty() ? chrome::kChromeUIDevToolsURL : base_url.spec());
+ !remote_frontend.empty() ?
+ remote_frontend :
+ base_url.is_empty() ? chrome::kChromeUIDevToolsURL : base_url.spec());
std::string url_string(
frontend_url +
((frontend_url.find("?") == std::string::npos) ? "?" : "&"));
@@ -764,7 +766,6 @@ GURL DevToolsWindow::GetDevToolsURL(Profile* profile,
url_string += "&isSharedWorker=true";
if (remote_frontend.size()) {
url_string += "&remoteFrontend=true";
- url_string += "&remoteFrontendUrl=" + net::EscapePath(remote_frontend);
} else {
url_string += "&remoteBase=" + DevToolsUI::GetRemoteBaseURL().spec();
}
« no previous file with comments | « no previous file | chrome/common/url_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698