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

Side by Side Diff: chrome/browser/devtools/devtools_window.cc

Issue 985073003: [DevTools] Pass remoteBase query param to frontend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/webui/devtools_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/devtools/devtools_window.h" 5 #include "chrome/browser/devtools/devtools_window.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/json/json_reader.h" 9 #include "base/json/json_reader.h"
10 #include "base/metrics/histogram.h" 10 #include "base/metrics/histogram.h"
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 std::string frontend_url( 752 std::string frontend_url(
753 base_url.is_empty() ? chrome::kChromeUIDevToolsURL : base_url.spec()); 753 base_url.is_empty() ? chrome::kChromeUIDevToolsURL : base_url.spec());
754 std::string url_string( 754 std::string url_string(
755 frontend_url + 755 frontend_url +
756 ((frontend_url.find("?") == std::string::npos) ? "?" : "&")); 756 ((frontend_url.find("?") == std::string::npos) ? "?" : "&"));
757 if (shared_worker_frontend) 757 if (shared_worker_frontend)
758 url_string += "&isSharedWorker=true"; 758 url_string += "&isSharedWorker=true";
759 if (remote_frontend.size()) { 759 if (remote_frontend.size()) {
760 url_string += "&remoteFrontend=true"; 760 url_string += "&remoteFrontend=true";
761 url_string += "&remoteFrontendUrl=" + net::EscapePath(remote_frontend); 761 url_string += "&remoteFrontendUrl=" + net::EscapePath(remote_frontend);
762 } else {
763 url_string += "&remoteBase=" + DevToolsUI::GetRemoteBaseURL().spec();
762 } 764 }
763 if (can_dock) 765 if (can_dock)
764 url_string += "&can_dock=true"; 766 url_string += "&can_dock=true";
765 if (settings.size()) 767 if (settings.size())
766 url_string += "&settings=" + settings; 768 url_string += "&settings=" + settings;
767 return GURL(url_string); 769 return GURL(url_string);
768 } 770 }
769 771
770 // static 772 // static
771 DevToolsWindow* DevToolsWindow::FindDevToolsWindow( 773 DevToolsWindow* DevToolsWindow::FindDevToolsWindow(
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
1203 closure.Run(); 1205 closure.Run();
1204 return; 1206 return;
1205 } 1207 }
1206 load_completed_callback_ = closure; 1208 load_completed_callback_ = closure;
1207 } 1209 }
1208 1210
1209 bool DevToolsWindow::ForwardKeyboardEvent( 1211 bool DevToolsWindow::ForwardKeyboardEvent(
1210 const content::NativeWebKeyboardEvent& event) { 1212 const content::NativeWebKeyboardEvent& event) {
1211 return event_forwarder_->ForwardEvent(event); 1213 return event_forwarder_->ForwardEvent(event);
1212 } 1214 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/devtools_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698