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

Unified Diff: chrome/browser/devtools/device/port_forwarding_controller.cc

Issue 2514933003: DevTools: enable target domain handler on the browser target, make browser target non-discoverable.
Patch Set: rebaselined Created 3 years, 10 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
Index: chrome/browser/devtools/device/port_forwarding_controller.cc
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index 35587ac62e3abfc99998252b2e6bf0ad235ca1c6..03a7f5841281b0e93dfdf8652bfa41243f153a55 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/threading/non_thread_safe.h"
+#include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
#include "chrome/browser/devtools/devtools_protocol.h"
#include "chrome/browser/devtools/devtools_protocol_constants.h"
#include "chrome/browser/profiles/profile.h"
@@ -260,9 +261,11 @@ PortForwardingController::Connection::Connection(
forwarding_map_(forwarding_map) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
(*registry_)[device_->serial()] = this;
- web_socket_.reset(
- device_->CreateWebSocket(browser->socket(),
- kDevToolsRemoteBrowserTarget, this));
+ std::string path = kDevToolsRemoteBrowserTarget;
+ std::string guid = ChromeDevToolsManagerDelegate::GetBrowserGUID();
+ if (!guid.empty())
+ path = path + "/" + guid;
+ web_socket_.reset(device_->CreateWebSocket(browser->socket(), path, this));
}
PortForwardingController::Connection::~Connection() {
« no previous file with comments | « chrome/browser/devtools/chrome_devtools_manager_delegate.cc ('k') | content/browser/devtools/browser_devtools_agent_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698