mirror of
https://github.com/electron/electron.git
synced 2026-01-15 02:18:18 -05:00
* chore: bump chromium in DEPS to 142.0.7401.0
* 6911185: Reland "Send touch moves async immediately after scroll starts."
https://chromium-review.googlesource.com/c/chromium/src/+/6911185
* 6906887: mac: click through content area in main window
https://chromium-review.googlesource.com/c/chromium/src/+/6906887
* 6916667: Expose helper to eliminate duplicate recipes.
https://chromium-review.googlesource.com/c/chromium/src/+/6916667
* 6909842: Switch LegacyRenderWidgetHostHWND from atlcrack.h to msg_util.h.
https://chromium-review.googlesource.com/c/chromium/src/+/6909842
* 6884056: Remove the SecKeychain implementation for the Keychain interface
https://chromium-review.googlesource.com/c/chromium/src/+/6884056
* 6904906: Remove `WTF::` in renderer/core/[p-x].*/
https://chromium-review.googlesource.com/c/chromium/src/+/6904906
* 6556585: [persistent_cache]: PersistentCache for CodeCache
https://chromium-review.googlesource.com/c/chromium/src/+/6556585
* 6904864: Layout: Support abort on the text placeholder layout
https://chromium-review.googlesource.com/c/chromium/src/+/6904864
* chore: fixup patch indices
* chore: bump chromium in DEPS to 142.0.7402.0
* fixup! 6556585: [persistent_cache]: PersistentCache for CodeCache
* chore: fixup patch indices
* 6905244: [api] Remove deprecated `GetIsolate`
https://chromium-review.googlesource.com/c/v8/v8/+/6905244
* 6897694: Remove NativeTheme::UserHasContrastPreference().
https://chromium-review.googlesource.com/c/chromium/src/+/6897694
* 6897477: Remove GetPlatformHighContrastColorScheme() and enum.
https://chromium-review.googlesource.com/c/chromium/src/+/6897477
* 6918198: Reland "Rename display::Screen::GetScreen() to display::Screen::Get()"
https://chromium-review.googlesource.com/c/chromium/src/+/6918198
* 6907147: [LNA] add use counter for websocket mixed-content issues
https://chromium-review.googlesource.com/c/chromium/src/+/6907147
* 6914538: Replace WTF::String with blink::String
https://chromium-review.googlesource.com/c/website/+/6914538
* 6892538: [video pip] Allow touchscreen users to toggle live caption
https://chromium-review.googlesource.com/c/chromium/src/+/6892538
* chore: fix patch
* chore: bump chromium in DEPS to 142.0.7403.0
* build: remove ninja logs
* chore: fixup patch indices
* 6920670: [PDF] Change pdf_extension_util to return dictionaries
https://chromium-review.googlesource.com/c/chromium/src/+/6920670
* 6917864: Devirtualize and inline various NativeTheme getters.
https://chromium-review.googlesource.com/c/chromium/src/+/6917864
* 6920873: [PDF] Simplify PDFDocumentHelperClient::OnSaveURL()
https://chromium-review.googlesource.com/c/chromium/src/+/6920873
* build: don't kill blink/web_tests
* 6923655: Roll libc++ from 954086abf121 to b87b2bb112f8 (4 revisions)
https://chromium-review.googlesource.com/c/chromium/src/+/6923655
* 6905242: Reland "[CSP] Clarify report-only console messages."
https://chromium-review.googlesource.com/c/chromium/src/+/6905242
* fixup! 6897694: Remove NativeTheme::UserHasContrastPreference().
* chore: bump chromium in DEPS to 142.0.7405.0
* 6910012: [LNA] Enable LNA enforcement by default
https://chromium-review.googlesource.com/c/chromium/src/+/6910012
* 6929444: Combine GetInstanceForXXX() implementations.
https://chromium-review.googlesource.com/c/chromium/src/+/6929444
* 6927873: Rename native_widget_types.h -> native_ui_types.h
https://chromium-review.googlesource.com/c/chromium/src/+/6927873
* 6853978: Init perfetto really early in WebView
https://chromium-review.googlesource.com/c/chromium/src/+/6853978
* 6874886: Use only one picker observer to avoid getting duplicate notifications
https://chromium-review.googlesource.com/c/chromium/src/+/6874886
* chore: fixup patch indices
* fix: Protocol complex inline dtor
* chore: bump chromium in DEPS to 142.0.7407.0
* chore: bump chromium in DEPS to 142.0.7409.0
* chore: bump chromium in DEPS to 142.0.7411.0
* chore: bump chromium in DEPS to 142.0.7413.0
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
* 6927233: Remove NativeTheme "use dark colors" bit.
https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* chore: fixup patch indices
* 6899206: [PermissionOptions] Multi-state permission subscriptions & setting changes
https://chromium-review.googlesource.com/c/chromium/src/+/6899206
* chore: bump chromium in DEPS to 142.0.7415.0
* 6936895: [headless] Remove headless flag from views::Widget class
https://chromium-review.googlesource.com/c/chromium/src/+/6936895
We should probably followup on this to see if there is a way to do this without reverting this CL.
* 6937023: Reland "Use new DBus type system in dbus_xdg::Request"
https://chromium-review.googlesource.com/c/chromium/src/+/6937023
* chore: update patches
* 6944749: Add GN visibility list to //components/os_crypt/sync
https://chromium-review.googlesource.com/c/chromium/src/+/6944749
* Further replace sub_capture_target_version with CaptureVersion
https://chromium-review.googlesource.com/c/chromium/src/+/6935455
* fixup for lint
* chore: update filenames.libcxx.gni
* chore: bump chromium in DEPS to 142.0.7417.0
* 6944136: Reorder NativeTheme headers/.cc files.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944136
* 6939701: [DSSC][4] Make FSVCI objects aware of their capture-version-source
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6939701
* 6944404: Remove extraneous callback call
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6944404
* 6936124: [FPF-CI]: Introduce blink::NoiseToken for fingerprinting protection
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6936124
* chore: update patches
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* fixup! 6917864: Devirtualize and inline various NativeTheme getters.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6917864
* 6937588: Add initial OsSettingsProvider object, supplying caret blink interval.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6937588
* fixup! 6905242: Reland "[CSP] Clarify report-only console messages."
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6905242
* 6907515: Replace SingletonHwndObserver with a CallbackList on SingletonHwnd.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6907515
* 6910482: [Save to Drive] Implement retry functionality
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6910482
* fixup! 6927233: Remove NativeTheme "use dark colors" bit.
Refs https://chromium-review.googlesource.com/c/chromium/src/+/6927233
* Revert "build: remove ninja logs"
This reverts commit 72874740fd.
* test: fix flakey test picked from PR 48205
---------
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Alice Zhao <alicelovescake@anthropic.com>
107 lines
3.7 KiB
C++
107 lines
3.7 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/path_service.h"
|
|
#include "base/values.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);
|
|
#if BUILDFLAG(ENABLE_PDF_VIEWER)
|
|
AddComponentResourceEntries(kPdfResources);
|
|
|
|
// Register strings for the PDF viewer, so that $i18n{} replacements work.
|
|
base::Value::Dict dict = pdf_extension_util::GetStrings(
|
|
pdf_extension_util::PdfViewerContext::kPdfViewer);
|
|
|
|
ui::TemplateReplacements pdf_viewer_replacements;
|
|
ui::TemplateReplacementsFromDictionaryValue(dict, &pdf_viewer_replacements);
|
|
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 = template_replacements_.find(extension_id);
|
|
if (it == template_replacements_.end()) {
|
|
return nullptr;
|
|
}
|
|
return &it->second;
|
|
}
|
|
|
|
void ElectronComponentExtensionResourceManager::AddComponentResourceEntries(
|
|
const base::span<const webui::ResourcePath> entries) {
|
|
base::FilePath gen_folder_path = base::FilePath().AppendASCII(
|
|
"@out_folder@/gen/chrome/browser/resources/");
|
|
gen_folder_path = gen_folder_path.NormalizePathSeparators();
|
|
|
|
for (const auto& entry : entries) {
|
|
const int id = entry.id;
|
|
base::FilePath resource_path = base::FilePath().AppendASCII(entry.path);
|
|
resource_path = resource_path.NormalizePathSeparators();
|
|
|
|
if (!gen_folder_path.IsParent(resource_path)) {
|
|
const auto [_, inserted] =
|
|
path_to_resource_id_.try_emplace(std::move(resource_path), id);
|
|
DCHECK(inserted);
|
|
} 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()));
|
|
const auto [_, inserted] =
|
|
path_to_resource_id_.try_emplace(std::move(effective_path), id);
|
|
DCHECK(inserted);
|
|
}
|
|
}
|
|
}
|
|
|
|
} // namespace extensions
|