[Fuchsia] Remove dependency on devtools-frontend
Devtools frontend is not supported on Fuchsia. Remove dependencies on the corresponding resources. Bug: 396724495 Change-Id: I5b31e5d0cf96af849b4070b6786472f75a1a7568 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6278810 Reviewed-by: Rakina Zata Amni <rakina@chromium.org> Reviewed-by: Junji Watanabe <jwata@google.com> Reviewed-by: Sam McNally <sammc@chromium.org> Commit-Queue: Sergey Ulanov <sergeyu@chromium.org> Reviewed-by: John Lee <johntlee@chromium.org> Cr-Commit-Position: refs/heads/main@{#1422107}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
190498d42f
commit
647ad46d95
2
BUILD.gn
2
BUILD.gn
@ -343,7 +343,7 @@ group("gn_all") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
if (use_aura || is_mac) {
|
if (!is_android && !is_ios && !is_fuchsia) {
|
||||||
deps += [ "//ui/webui/examples:webui_examples" ]
|
deps += [ "//ui/webui/examples:webui_examples" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3484,7 +3484,7 @@ source_set("browser") {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is_android && !is_ios) {
|
if (!is_android && !is_ios && !is_fuchsia) {
|
||||||
sources += [
|
sources += [
|
||||||
# Devtools frontend not included in Android and iOS
|
# Devtools frontend not included in Android and iOS
|
||||||
"devtools/devtools_frontend_host_impl.cc",
|
"devtools/devtools_frontend_host_impl.cc",
|
||||||
|
@ -1266,7 +1266,7 @@ void PopulateBinderMapWithContext(
|
|||||||
ProcessInternalsUI>(map);
|
ProcessInternalsUI>(map);
|
||||||
RegisterWebUIControllerInterfaceBinder<storage::mojom::QuotaInternalsHandler,
|
RegisterWebUIControllerInterfaceBinder<storage::mojom::QuotaInternalsHandler,
|
||||||
QuotaInternalsUI>(map);
|
QuotaInternalsUI>(map);
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
RegisterWebUIControllerInterfaceBinder<
|
RegisterWebUIControllerInterfaceBinder<
|
||||||
trace_report::mojom::TraceReportHandlerFactory, TraceReportInternalsUI>(
|
trace_report::mojom::TraceReportHandlerFactory, TraceReportInternalsUI>(
|
||||||
map);
|
map);
|
||||||
|
@ -11,7 +11,7 @@ import("//third_party/protobuf/proto_library.gni")
|
|||||||
import("//tools/grit/grit_rule.gni")
|
import("//tools/grit/grit_rule.gni")
|
||||||
|
|
||||||
# Android and iOS don't support DevTools front-end.
|
# Android and iOS don't support DevTools front-end.
|
||||||
if (!is_android && !is_ios) {
|
if (!is_android && !is_ios && !is_fuchsia) {
|
||||||
source_set("devtools_resources_extern") {
|
source_set("devtools_resources_extern") {
|
||||||
sources = [ "devtools_resources.cc" ]
|
sources = [ "devtools_resources.cc" ]
|
||||||
|
|
||||||
|
@ -744,7 +744,7 @@ void DevToolsHttpHandler::OnDiscoveryPageRequest(int connection_id) {
|
|||||||
|
|
||||||
void DevToolsHttpHandler::OnFrontendResourceRequest(
|
void DevToolsHttpHandler::OnFrontendResourceRequest(
|
||||||
int connection_id, const std::string& path) {
|
int connection_id, const std::string& path) {
|
||||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
|
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
|
||||||
Send404(connection_id);
|
Send404(connection_id);
|
||||||
#else
|
#else
|
||||||
Send200(connection_id,
|
Send200(connection_id,
|
||||||
|
@ -51,7 +51,7 @@ void RegisterContentWebUIConfigs() {
|
|||||||
map.AddWebUIConfig(std::make_unique<WebXrInternalsUIConfig>());
|
map.AddWebUIConfig(std::make_unique<WebXrInternalsUIConfig>());
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
map.AddWebUIConfig(std::make_unique<TraceReportInternalsUIConfig>());
|
map.AddWebUIConfig(std::make_unique<TraceReportInternalsUIConfig>());
|
||||||
map.AddWebUIConfig(std::make_unique<TracingUIConfig>());
|
map.AddWebUIConfig(std::make_unique<TracingUIConfig>());
|
||||||
#endif
|
#endif
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
|
#include "services/network/public/cpp/simple_url_loader_stream_consumer.h"
|
||||||
#include "services/network/public/mojom/url_response_head.mojom.h"
|
#include "services/network/public/mojom/url_response_head.mojom.h"
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
#include "base/command_line.h"
|
#include "base/command_line.h"
|
||||||
#include "content/public/browser/devtools_frontend_host.h"
|
#include "content/public/browser/devtools_frontend_host.h"
|
||||||
#include "content/shell/common/shell_switches.h"
|
#include "content/shell/common/shell_switches.h"
|
||||||
@ -191,7 +191,7 @@ ShellDevToolsBindings::~ShellDevToolsBindings() {
|
|||||||
|
|
||||||
void ShellDevToolsBindings::ReadyToCommitNavigation(
|
void ShellDevToolsBindings::ReadyToCommitNavigation(
|
||||||
NavigationHandle* navigation_handle) {
|
NavigationHandle* navigation_handle) {
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
|
content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
|
||||||
if (navigation_handle->IsInPrimaryMainFrame()) {
|
if (navigation_handle->IsInPrimaryMainFrame()) {
|
||||||
frontend_host_ = DevToolsFrontendHost::Create(
|
frontend_host_ = DevToolsFrontendHost::Create(
|
||||||
|
@ -77,7 +77,7 @@ class ShellDevToolsBindings : public WebContentsObserver,
|
|||||||
scoped_refptr<DevToolsAgentHost> agent_host_;
|
scoped_refptr<DevToolsAgentHost> agent_host_;
|
||||||
int inspect_element_at_x_;
|
int inspect_element_at_x_;
|
||||||
int inspect_element_at_y_;
|
int inspect_element_at_y_;
|
||||||
#if !BUILDFLAG(IS_ANDROID)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
std::unique_ptr<DevToolsFrontendHost> frontend_host_;
|
std::unique_ptr<DevToolsFrontendHost> frontend_host_;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
#include "content/web_test/common/web_test_switches.h"
|
#include "content/web_test/common/web_test_switches.h"
|
||||||
#include "ipc/ipc_channel.h"
|
#include "ipc/ipc_channel.h"
|
||||||
|
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
#include "content/public/browser/devtools_frontend_host.h"
|
#include "content/public/browser/devtools_frontend_host.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -95,7 +95,7 @@ void DevToolsProtocolTestBindings::ParseLog(std::string_view log) {
|
|||||||
|
|
||||||
void DevToolsProtocolTestBindings::ReadyToCommitNavigation(
|
void DevToolsProtocolTestBindings::ReadyToCommitNavigation(
|
||||||
NavigationHandle* navigation_handle) {
|
NavigationHandle* navigation_handle) {
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
|
content::RenderFrameHost* frame = navigation_handle->GetRenderFrameHost();
|
||||||
if (frame->GetParent())
|
if (frame->GetParent())
|
||||||
return;
|
return;
|
||||||
|
@ -45,7 +45,7 @@ class DevToolsProtocolTestBindings : public WebContentsObserver,
|
|||||||
void HandleMessageFromTest(base::Value::Dict message);
|
void HandleMessageFromTest(base::Value::Dict message);
|
||||||
|
|
||||||
scoped_refptr<DevToolsAgentHost> agent_host_;
|
scoped_refptr<DevToolsAgentHost> agent_host_;
|
||||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) && !BUILDFLAG(IS_FUCHSIA)
|
||||||
// DevToolsFrontendHost does not exist on Android and iOS, but we also don't
|
// DevToolsFrontendHost does not exist on Android and iOS, but we also don't
|
||||||
// run web tests natively on Android.
|
// run web tests natively on Android.
|
||||||
std::unique_ptr<DevToolsFrontendHost> frontend_host_;
|
std::unique_ptr<DevToolsFrontendHost> frontend_host_;
|
||||||
|
Reference in New Issue
Block a user