chrome/browser/devtools/chrome_devtools_discovery_provider.cc - Issue 2263843002: DevTools: merge devtools target with devtools host, part 1

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2263843002: DevTools: merge devtools target with devtools host, part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: for landing 3 Created 4 years, 4 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 | « chrome/browser/android/dev_tools_discovery_provider_android.cc ('k') | chrome/browser/devtools/chrome_devtools_manager_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/devtools/chrome_devtools_discovery_provider.cc

diff --git a/chrome/browser/devtools/chrome_devtools_discovery_provider.cc b/chrome/browser/devtools/chrome_devtools_discovery_provider.cc

index 3535d6dfc3cee007e0b7f53e23b16a2eea8785e2..34dfafe682c5ad0591e8479e429bf65c312186d3 100644

--- a/chrome/browser/devtools/chrome_devtools_discovery_provider.cc

+++ b/chrome/browser/devtools/chrome_devtools_discovery_provider.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/browser_navigator.h"

#include "chrome/browser/ui/browser_navigator_params.h"

+#include "content/public/browser/devtools_agent_host.h"

namespace {

@@ -20,7 +21,12 @@ CreateNewChromeTab(const GURL& url) {

chrome::Navigate(&params);

if (!params.target_contents)

return std::unique_ptr<devtools_discovery::DevToolsTargetDescriptor>();

- return DevToolsTargetImpl::CreateForTab(params.target_contents);

+ if (!params.target_contents)

+ return nullptr;

+ scoped_refptr<content::DevToolsAgentHost> host =

+ content::DevToolsAgentHost::GetOrCreateFor(params.target_contents);

+ return std::unique_ptr<DevToolsTargetImpl>(new DevToolsTargetImpl(host));

}

} // namespace