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

Side by Side Diff: chrome/browser/android/devtools_manager_delegate_android.cc

Issue 2361613002: DevTools: untangle device discovery request from the devtools android bridge. (Closed)
Patch Set: make device hosts profile-independent, plump browser context for inspect. Created 4 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/android/devtools_manager_delegate_android.h" 5 #include "chrome/browser/android/devtools_manager_delegate_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 87
88 bool Activate() override { 88 bool Activate() override {
89 TabModel* model; 89 TabModel* model;
90 int index; 90 int index;
91 if (!FindTab(&model, &index)) 91 if (!FindTab(&model, &index))
92 return false; 92 return false;
93 model->SetActiveIndex(index); 93 model->SetActiveIndex(index);
94 return true; 94 return true;
95 } 95 }
96 96
97 bool Inspect() override { 97 bool Inspect(content::BrowserContext* context) override {
98 MaterializeAgentHost(); 98 MaterializeAgentHost();
99 if (agent_host_) 99 if (agent_host_)
100 return agent_host_->Inspect(); 100 return agent_host_->Inspect(context);
dgozman 2016/09/22 17:13:59 It's strange to pass BrowserContext in just so tha
101 return false; 101 return false;
102 } 102 }
103 103
104 void Reload() override { 104 void Reload() override {
105 MaterializeAgentHost(); 105 MaterializeAgentHost();
106 if (agent_host_) 106 if (agent_host_)
107 agent_host_->Reload(); 107 agent_host_->Reload();
108 } 108 }
109 109
110 bool Close() override { 110 bool Close() override {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 161
162 } // namespace 162 } // namespace
163 163
164 DevToolsManagerDelegateAndroid::DevToolsManagerDelegateAndroid() 164 DevToolsManagerDelegateAndroid::DevToolsManagerDelegateAndroid()
165 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) { 165 : network_protocol_handler_(new DevToolsNetworkProtocolHandler()) {
166 } 166 }
167 167
168 DevToolsManagerDelegateAndroid::~DevToolsManagerDelegateAndroid() { 168 DevToolsManagerDelegateAndroid::~DevToolsManagerDelegateAndroid() {
169 } 169 }
170 170
171 void DevToolsManagerDelegateAndroid::Inspect(
172 DevToolsAgentHost* agent_host) {
173 }
174
175 base::DictionaryValue* DevToolsManagerDelegateAndroid::HandleCommand( 171 base::DictionaryValue* DevToolsManagerDelegateAndroid::HandleCommand(
176 DevToolsAgentHost* agent_host, 172 DevToolsAgentHost* agent_host,
177 base::DictionaryValue* command_dict) { 173 base::DictionaryValue* command_dict) {
178 return network_protocol_handler_->HandleCommand(agent_host, command_dict); 174 return network_protocol_handler_->HandleCommand(agent_host, command_dict);
179 } 175 }
180 176
181 std::string DevToolsManagerDelegateAndroid::GetTargetType( 177 std::string DevToolsManagerDelegateAndroid::GetTargetType(
182 content::RenderFrameHost* host) { 178 content::RenderFrameHost* host) {
183 content::WebContents* web_contents = 179 content::WebContents* web_contents =
184 content::WebContents::FromRenderFrameHost(host); 180 content::WebContents::FromRenderFrameHost(host);
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 259
264 std::string DevToolsManagerDelegateAndroid::GetDiscoveryPageHTML() { 260 std::string DevToolsManagerDelegateAndroid::GetDiscoveryPageHTML() {
265 return ResourceBundle::GetSharedInstance().GetRawDataResource( 261 return ResourceBundle::GetSharedInstance().GetRawDataResource(
266 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string(); 262 IDR_DEVTOOLS_DISCOVERY_PAGE_HTML).as_string();
267 } 263 }
268 264
269 void DevToolsManagerDelegateAndroid::DevToolsAgentStateChanged( 265 void DevToolsManagerDelegateAndroid::DevToolsAgentStateChanged(
270 DevToolsAgentHost* agent_host, bool attached) { 266 DevToolsAgentHost* agent_host, bool attached) {
271 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached); 267 network_protocol_handler_->DevToolsAgentStateChanged(agent_host, attached);
272 } 268 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698