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

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

Issue 2119063002: Add commands to manage tabs and contexts to Browser Domain (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix name Created 4 years, 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/chrome_devtools_manager_delegate.h" 5 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/devtools/devtools_network_protocol_handler.h" 8 #include "chrome/browser/devtools/devtools_network_protocol_handler.h"
9 #include "components/devtools_discovery/devtools_discovery_manager.h"
9 10
10 #if !defined(OS_ANDROID) 11 #if !defined(OS_ANDROID)
11 #include "chrome/browser/devtools/devtools_window.h" 12 #include "chrome/browser/devtools/devtools_window.h"
12 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
13 #include "content/public/browser/devtools_agent_host.h" 14 #include "content/public/browser/devtools_agent_host.h"
14 #endif // !defined(OS_ANDROID) 15 #endif // !defined(OS_ANDROID)
15 16
17 using devtools_discovery::DevToolsDiscoveryManager;
18
16 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate() 19 ChromeDevToolsManagerDelegate::ChromeDevToolsManagerDelegate()
17 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { 20 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
18 } 21 }
19 22
20 ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() { 23 ChromeDevToolsManagerDelegate::~ChromeDevToolsManagerDelegate() {
21 } 24 }
22 25
23 void ChromeDevToolsManagerDelegate::Inspect( 26 void ChromeDevToolsManagerDelegate::Inspect(
24 content::BrowserContext* browser_context, 27 content::BrowserContext* browser_context,
25 content::DevToolsAgentHost* agent_host) { 28 content::DevToolsAgentHost* agent_host) {
(...skipping 11 matching lines...) Expand all
37 content::WebContents* web_contents = agent_host->GetWebContents(); 40 content::WebContents* web_contents = agent_host->GetWebContents();
38 DCHECK(web_contents); 41 DCHECK(web_contents);
39 DevToolsWindow::OpenDevToolsWindow(web_contents); 42 DevToolsWindow::OpenDevToolsWindow(web_contents);
40 } 43 }
41 #endif // !defined(OS_ANDROID) 44 #endif // !defined(OS_ANDROID)
42 } 45 }
43 46
44 base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand( 47 base::DictionaryValue* ChromeDevToolsManagerDelegate::HandleCommand(
45 content::DevToolsAgentHost* agent_host, 48 content::DevToolsAgentHost* agent_host,
46 base::DictionaryValue* command_dict) { 49 base::DictionaryValue* command_dict) {
50 std::unique_ptr<base::DictionaryValue> result =
51 DevToolsDiscoveryManager::GetInstance()->HandleNewTargetCommand(
52 command_dict);
53 if (result)
54 return result.release(); // Caller takes ownership.
47 return network_protocol_handler_->HandleCommand(agent_host, command_dict); 55 return network_protocol_handler_->HandleCommand(agent_host, command_dict);
48 } 56 }
49 57
50 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged( 58 void ChromeDevToolsManagerDelegate::DevToolsAgentStateChanged(
51 content::DevToolsAgentHost* agent_host, 59 content::DevToolsAgentHost* agent_host,
52 bool attached) { 60 bool attached) {
53 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); 61 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
54 } 62 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698