90af7d7fe2
* chore: bump chromium in DEPS to 110.0.5461.0 * chore: update patches * 3903024: hid: Add connection count tracking methods for HidDelegate https://chromium-review.googlesource.com/c/chromium/src/+/3903024 * 4076211: Turn FrameTreeNode::frame_tree into raw_ref. https://chromium-review.googlesource.com/c/chromium/src/+/4076211 * chore: bump chromium in DEPS to 110.0.5463.0 * chore: bump chromium in DEPS to 110.0.5465.0 * fix patches * 3835037: Add new slides media session actions to Picture-in-Picture window https://chromium-review.googlesource.com/c/chromium/src/+/3835037 * chore: update patches * chore: bump chromium in DEPS to 110.0.5467.0 * chore: update patches * chore: bump chromium in DEPS to 110.0.5469.0 * chore: bump chromium in DEPS to 110.0.5471.0 * chore: bump chromium in DEPS to 110.0.5473.0 * chore: bump chromium in DEPS to 110.0.5475.0 * chore: update patches * 4074449: Add gl::FrameData to software path https://chromium-review.googlesource.com/c/chromium/src/+/4074449 * 4065264: [Extensions] Add a new side panel view type https://chromium-review.googlesource.com/c/chromium/src/+/4065264 * 4060548: Remove base::Value::GetListDeprecated(). https://chromium-review.googlesource.com/c/chromium/src/+/4060548 * chore: add missing RefCountedMemory include * 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc} https://chromium-review.googlesource.com/c/chromium/src/+/4081108 * 4072471: Rename Mixed Download Blocking to Insecure Download Blocking https://chromium-review.googlesource.com/c/chromium/src/+/4072471 * 4025927: [Code Health] Migrate e/c/manifest.cc to base::Value::Dict interface https://chromium-review.googlesource.com/c/chromium/src/+/4025927 * chore: fixup patch indices * chore: bump chromium in DEPS to 110.0.5477.0 * chore: fixup preconnect_manager.patch * chore: fixup patch indices * fixup! 4074449: Add gl::FrameData to software path * 4074449: Add gl::FrameData to software path This commit also reformatted the two files in this patch. The only change here is the addition of the |data| arg to |OnSwapBuffers|. https://chromium-review.googlesource.com/c/chromium/src/+/4074449 * 4081108: task posting v3: remove task_runner_util{.h,_unittest.cc} https://chromium-review.googlesource.com/c/chromium/src/+/4081108 * 4085814: [Test Automation] Move NativeWindowTracker to ui/views https://chromium-review.googlesource.com/c/chromium/src/+/4085814 * 4032656: hid: Abstract HidSystemTrayIcon class for profiles' HID connections https://chromium-review.googlesource.com/c/chromium/src/+/4032656 * chore: bump chromium in DEPS to 110.0.5479.0 * chore: fixup patches & simplify printing patch To be specific, I replaced some combination of line removals & commenting-out with `#if 0` blocks since they were already there for android. Should be functionally the same, just written differently for better patch maintainability. * chore: bump chromium in DEPS to 110.0.5481.0 * chore: update patch indicies * 4098946: Migrate Extension::Create() argument to base::Value::Dict (part 4 of 4) https://chromium-review.googlesource.com/c/chromium/src/+/4098946 * chore: bump chromium in DEPS to 111.0.5482.0 * chore: bump chromium in DEPS to 111.0.5484.0 * chore: bump chromium in DEPS to 111.0.5486.0 * chore: update patch indices * 4112903: Reland "Move gl::FrameData to gfx::FrameData" https://chromium-review.googlesource.com/c/chromium/src/+/4112903 * 4056216: Option to create a tab target with Target.createTarget in /json/new https://chromium-review.googlesource.com/c/chromium/src/+/4056216 * chore: bump chromium in DEPS to 111.0.5488.0 * chore: bump chromium in DEPS to 111.0.5490.0 * chore: bump chromium in DEPS to 111.0.5492.0 * chore: bump chromium in DEPS to 111.0.5494.0 * chore: bump chromium in DEPS to 111.0.5496.0 * chore: bump chromium in DEPS to 111.0.5498.0 * chore: bump chromium in DEPS to 111.0.5500.0 * chore: bump chromium in DEPS to 111.0.5502.0 * chore: update patch indices + small update to printing.patch due to: 3653941: [printing] Extract settings logic from PrintJobWorker https://chromium-review.googlesource.com/c/chromium/src/+/3653941 * 4113994: Cleanup: Rename webui_generated_resources_* to webui_resources_*. https://chromium-review.googlesource.com/c/chromium/src/+/4113994 * 4112537: Remove DictionaryPrefUpdate. https://chromium-review.googlesource.com/c/chromium/src/+/4112537 * 4072073: Remove //chrome/browser/ash dependency from pdf_extension_util.cc https://chromium-review.googlesource.com/c/chromium/src/+/4072073 * 4055223: [Remove FileSystemConnector] Remove DownloadItemRerouteInfo https://chromium-review.googlesource.com/c/chromium/src/+/4055223 * Migrate base::DictionaryValue to base::Value::Dict This relates to multiple CLs cleaning up this class in this roll, but the ones that are specifically relevant here: 4116096: [CodeHealth] Remove DictionaryValue::GetInteger https://chromium-review.googlesource.com/c/chromium/src/+/4116096 4113764: [CodeHealth] Remove deprecated DictionaryValue::SetInteger() https://chromium-review.googlesource.com/c/chromium/src/+/4113764 * 3653941: [printing] Extract settings logic from PrintJobWorker https://chromium-review.googlesource.com/c/chromium/src/+/3653941 * chore: bump chromium in DEPS to 111.0.5504.0 * chore: update patches * (WIP) 4003663: Enable Microtask queues per WindowAgent. https://chromium-review.googlesource.com/c/chromium/src/+/4003663 * chore: bump chromium in DEPS to 111.0.5506.0 * chore: update patches * fix: printing patch It was complaining that this method isn't used on windows * chore: bump chromium in DEPS to 111.0.5508.0 * chore: bump chromium in DEPS to 111.0.5510.0 * chore: bump chromium in DEPS to 111.0.5512.0 * chore: bump chromium in DEPS to 111.0.5514.0 * chore: bump chromium in DEPS to 111.0.5516.0 * chore: update patches * chore: bump chromium in DEPS to 111.0.5518.0 * chore: update patches * 4027428: [rsafor] Move rsaFor requests to a separate permission https://chromium-review.googlesource.com/c/chromium/src/+/4027428 * Revert "(WIP) 4003663: Enable Microtask queues per WindowAgent." This reverts commit cc36d226e3f3fe5f4bea6538102d55ce3203190f. * chore: disable Microtask queues per WindowAgent. see https://chromium-review.googlesource.com/c/chromium/src/+/4003663 * chore: cleanup after rebase * fixup: disable Microtask queues per WindowAgent. * chore: cleanup password from keychain after test Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Calvin Watford <cwatford@slack-corp.com> Co-authored-by: clavin <clavin@electronjs.org>
113 lines
4 KiB
C++
113 lines
4 KiB
C++
// Copyright 2014 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 "shell/browser/extensions/electron_component_extension_resource_manager.h"
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
|
|
#include "base/containers/contains.h"
|
|
#include "base/logging.h"
|
|
#include "base/path_service.h"
|
|
#include "base/stl_util.h"
|
|
#include "base/values.h"
|
|
#include "build/build_config.h"
|
|
#include "chrome/common/chrome_paths.h"
|
|
#include "chrome/grit/component_extension_resources_map.h"
|
|
#include "electron/buildflags/buildflags.h"
|
|
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
#include "chrome/browser/pdf/pdf_extension_util.h" // nogncheck
|
|
#include "chrome/grit/pdf_resources_map.h"
|
|
#include "extensions/common/constants.h"
|
|
#endif
|
|
|
|
namespace extensions {
|
|
|
|
ElectronComponentExtensionResourceManager::
|
|
ElectronComponentExtensionResourceManager() {
|
|
AddComponentResourceEntries(kComponentExtensionResources,
|
|
kComponentExtensionResourcesSize);
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
AddComponentResourceEntries(kPdfResources, kPdfResourcesSize);
|
|
|
|
// Register strings for the PDF viewer, so that $i18n{} replacements work.
|
|
base::Value::Dict pdf_strings;
|
|
pdf_extension_util::AddStrings(
|
|
pdf_extension_util::PdfViewerContext::kPdfViewer, &pdf_strings);
|
|
pdf_extension_util::AddAdditionalData(false, true, &pdf_strings);
|
|
|
|
ui::TemplateReplacements pdf_viewer_replacements;
|
|
ui::TemplateReplacementsFromDictionaryValue(pdf_strings,
|
|
&pdf_viewer_replacements);
|
|
extension_template_replacements_[extension_misc::kPdfExtensionId] =
|
|
std::move(pdf_viewer_replacements);
|
|
#endif
|
|
}
|
|
|
|
ElectronComponentExtensionResourceManager::
|
|
~ElectronComponentExtensionResourceManager() = default;
|
|
|
|
bool ElectronComponentExtensionResourceManager::IsComponentExtensionResource(
|
|
const base::FilePath& extension_path,
|
|
const base::FilePath& resource_path,
|
|
int* resource_id) const {
|
|
base::FilePath directory_path = extension_path;
|
|
base::FilePath resources_dir;
|
|
base::FilePath relative_path;
|
|
if (!base::PathService::Get(chrome::DIR_RESOURCES, &resources_dir) ||
|
|
!resources_dir.AppendRelativePath(directory_path, &relative_path)) {
|
|
return false;
|
|
}
|
|
relative_path = relative_path.Append(resource_path);
|
|
relative_path = relative_path.NormalizePathSeparators();
|
|
|
|
auto entry = path_to_resource_id_.find(relative_path);
|
|
if (entry != path_to_resource_id_.end()) {
|
|
*resource_id = entry->second;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
const ui::TemplateReplacements*
|
|
ElectronComponentExtensionResourceManager::GetTemplateReplacementsForExtension(
|
|
const std::string& extension_id) const {
|
|
auto it = extension_template_replacements_.find(extension_id);
|
|
if (it == extension_template_replacements_.end()) {
|
|
return nullptr;
|
|
}
|
|
return &it->second;
|
|
}
|
|
|
|
void ElectronComponentExtensionResourceManager::AddComponentResourceEntries(
|
|
const webui::ResourcePath* entries,
|
|
size_t size) {
|
|
base::FilePath gen_folder_path = base::FilePath().AppendASCII(
|
|
"@out_folder@/gen/chrome/browser/resources/");
|
|
gen_folder_path = gen_folder_path.NormalizePathSeparators();
|
|
|
|
for (size_t i = 0; i < size; ++i) {
|
|
base::FilePath resource_path =
|
|
base::FilePath().AppendASCII(entries[i].path);
|
|
resource_path = resource_path.NormalizePathSeparators();
|
|
|
|
if (!gen_folder_path.IsParent(resource_path)) {
|
|
DCHECK(!base::Contains(path_to_resource_id_, resource_path));
|
|
path_to_resource_id_[resource_path] = entries[i].id;
|
|
} else {
|
|
// If the resource is a generated file, strip the generated folder's path,
|
|
// so that it can be served from a normal URL (as if it were not
|
|
// generated).
|
|
base::FilePath effective_path =
|
|
base::FilePath().AppendASCII(resource_path.AsUTF8Unsafe().substr(
|
|
gen_folder_path.value().length()));
|
|
DCHECK(!base::Contains(path_to_resource_id_, effective_path));
|
|
path_to_resource_id_[effective_path] = entries[i].id;
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace extensions
|