Skip to content

Commit

Permalink
Revert "[Fuchsia] Enable devtools resources."
Browse files Browse the repository at this point in the history
This reverts commit 6cece3e.

Reason for revert: Increased WebEngine size by ~30MB

Original change's description:
> [Fuchsia] Enable devtools resources.
>
> R=​wez@chromium.org
>
> Bug: 1255904
> Test: Start chrome on Fuchsia, go to devtools using the menu
> Change-Id: I78d8ac8f850d7f6313adaa2223a68589d5b06ef9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3220792
> Reviewed-by: Wez <wez@chromium.org>
> Reviewed-by: Yang Guo <yangguo@chromium.org>
> Commit-Queue: Benjamin Lerman <qsr@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#931568}

Bug: 1255904, 1260089
Change-Id: I20542e14e70082bd72c7ca8d86e5f350d1a36cd2
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3224208
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Andrey Kosyakov <caseq@chromium.org>
Reviewed-by: David Dorwin <ddorwin@chromium.org>
Commit-Queue: Rohan Pavone <rohpavone@chromium.org>
Cr-Commit-Position: refs/heads/main@{#931706}
  • Loading branch information
Rohan Pavone authored and Chromium LUCI CQ committed Oct 14, 2021
1 parent d0e2557 commit 26eacb0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion content/browser/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -2408,7 +2408,7 @@ source_set("browser") {
]
}

if (!is_android) {
if (!is_fuchsia && !is_android) {
deps += [ "//content/browser/devtools:devtools_resources" ]
}

Expand Down
7 changes: 6 additions & 1 deletion content/browser/devtools/devtools_frontend_host_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,15 @@
#include "base/memory/ref_counted_memory.h"
#include "build/build_config.h"
#include "content/browser/bad_message.h"
#include "content/browser/devtools/grit/devtools_resources_map.h"
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_client.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"

#if !defined(OS_FUCHSIA)
#include "content/browser/devtools/grit/devtools_resources_map.h" // nogncheck
#endif

namespace content {

namespace {
Expand Down Expand Up @@ -48,11 +51,13 @@ void DevToolsFrontendHost::SetupExtensionsAPI(
// static
scoped_refptr<base::RefCountedMemory>
DevToolsFrontendHost::GetFrontendResourceBytes(const std::string& path) {
#if !defined(OS_FUCHSIA)
for (size_t i = 0; i < kDevtoolsResourcesSize; ++i) {
if (path == kDevtoolsResources[i].path) {
return GetContentClient()->GetDataResourceBytes(kDevtoolsResources[i].id);
}
}
#endif // defined(OS_FUCHSIA)
return nullptr;
}

Expand Down

0 comments on commit 26eacb0

Please sign in to comment.