| Index: android_webview/browser/aw_devtools_manager_delegate.cc
|
| diff --git a/android_webview/browser/aw_dev_tools_discovery_provider.cc b/android_webview/browser/aw_devtools_manager_delegate.cc
|
| similarity index 51%
|
| rename from android_webview/browser/aw_dev_tools_discovery_provider.cc
|
| rename to android_webview/browser/aw_devtools_manager_delegate.cc
|
| index d29be3f856cbd4ec5673e92a3beb475e3819830d..eee63820b0da05216d1d1eee831ec7c66066fced 100644
|
| --- a/android_webview/browser/aw_dev_tools_discovery_provider.cc
|
| +++ b/android_webview/browser/aw_devtools_manager_delegate.cc
|
| @@ -1,27 +1,50 @@
|
| -// Copyright 2015 The Chromium Authors. All rights reserved.
|
| +// Copyright 2013 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/browser/aw_dev_tools_discovery_provider.h"
|
| +#include "android_webview/browser/aw_devtools_manager_delegate.h"
|
|
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| +#include "android_webview/common/aw_content_client.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "base/values.h"
|
| #include "content/public/browser/devtools_agent_host.h"
|
| #include "content/public/browser/web_contents.h"
|
|
|
| using content::DevToolsAgentHost;
|
| -using content::WebContents;
|
| +using content::RenderFrameHost;
|
|
|
| -namespace {
|
| +namespace android_webview {
|
| +
|
| +AwDevToolsManagerDelegate::AwDevToolsManagerDelegate() {
|
| + content::DevToolsAgentHost::AddDiscoveryProvider(
|
| + base::Bind(&DevToolsAgentHost::GetOrCreateAll));
|
| +}
|
| +
|
| +AwDevToolsManagerDelegate::~AwDevToolsManagerDelegate() {
|
| +}
|
| +
|
| +void AwDevToolsManagerDelegate::Inspect(DevToolsAgentHost* agent_host) {
|
| +}
|
| +
|
| +void AwDevToolsManagerDelegate::DevToolsAgentStateChanged(
|
| + DevToolsAgentHost* agent_host, bool attached) {
|
| +}
|
| +
|
| +std::string AwDevToolsManagerDelegate::GetTargetType(RenderFrameHost* host) {
|
| + return "webview";
|
| +}
|
|
|
| -std::string GetViewDescription(WebContents* web_contents) {
|
| +std::string AwDevToolsManagerDelegate::GetTargetDescription(
|
| + RenderFrameHost* host) {
|
| + content::WebContents* web_contents =
|
| + content::WebContents::FromRenderFrameHost(host);
|
| android_webview::BrowserViewRenderer* bvr =
|
| android_webview::BrowserViewRenderer::FromWebContents(web_contents);
|
| - if (!bvr) return "";
|
| + if (!bvr)
|
| + return "";
|
| base::DictionaryValue description;
|
| description.SetBoolean("attached", bvr->attached_to_window());
|
| description.SetBoolean("visible", bvr->IsVisible());
|
| @@ -38,28 +61,14 @@ std::string GetViewDescription(WebContents* web_contents) {
|
| return json;
|
| }
|
|
|
| -content::DevToolsAgentHost::List GetDescriptors() {
|
| - DevToolsAgentHost::List agent_hosts = DevToolsAgentHost::GetOrCreateAll();
|
| - for (auto& agent_host : agent_hosts) {
|
| - agent_host->SetDescriptionOverride(
|
| - GetViewDescription(agent_host->GetWebContents()));
|
| - }
|
| - return agent_hosts;
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -namespace android_webview {
|
| -
|
| -// static
|
| -void AwDevToolsDiscoveryProvider::Install() {
|
| - content::DevToolsAgentHost::AddDiscoveryProvider(base::Bind(&GetDescriptors));
|
| -}
|
| -
|
| -AwDevToolsDiscoveryProvider::AwDevToolsDiscoveryProvider() {
|
| -}
|
| -
|
| -AwDevToolsDiscoveryProvider::~AwDevToolsDiscoveryProvider() {
|
| +std::string AwDevToolsManagerDelegate::GetDiscoveryPageHTML() {
|
| + const char html[] =
|
| + "<html>"
|
| + "<head><title>WebView remote debugging</title></head>"
|
| + "<body>Please use <a href=\'chrome://inspect\'>chrome://inspect</a>"
|
| + "</body>"
|
| + "</html>";
|
| + return html;
|
| }
|
|
|
| } // namespace android_webview
|
|
|
Chromium Code Reviews
Issue 2300703005:
DevTools: merge devtools_http_handler into content - it is used in all the embedders anyways. (Closed)
