mirror of
https://github.com/electron/electron.git
synced 2026-01-08 23:18:06 -05:00
chore: bump chromium to 129.0.6616.0 (main) (#43012)
* chore: bump chromium in DEPS to 128.0.6613.0 * chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076 * chore: export patches * chore: 5725076: Update EventType names | https://chromium-review.googlesource.com/c/chromium/src/+/5725076 for windows * chore: bump chromium in DEPS to 129.0.6614.0 * 5725672: Add a feature to limit the number of preconnect in LoadingPredictor | https://chromium-review.googlesource.com/c/chromium/src/+/5725672 * chore: bump chromium in DEPS to 129.0.6616.0 * chore: e patches all and resolve conflict in patches/v8/fix_disable_scope_reuse_associated_dchecks.patch * 5730656: Show an error dialog when UpdatePrintSettings() fails | https://chromium-review.googlesource.com/c/chromium/src/+/5730656 * chore: gen-libc++-filenames * 5729956: Finally remove string_piece.h | https://chromium-review.googlesource.com/c/chromium/src/+/5729956 * chore: replace all references of base::StringPiece with std::string_view * chore: remove more references of stringPiece in favor of string_view * chore: rename string_piece variables to string_view * 5508795: Remove the NotificationService | https://chromium-review.googlesource.com/c/chromium/src/+/5508795 * 5734053: Revert Rename GlobalFeatures to GlobalDesktopFeatures. | https://chromium-review.googlesource.com/c/chromium/src/+/5734053 * chore: resolve conflict with main without merge --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Alice Zhao <alice@makenotion.com>
This commit is contained in:
committed by
GitHub
parent
4286234721
commit
92496c1930
@@ -126,7 +126,7 @@ std::u16string ElectronContentClient::GetLocalizedString(int message_id) {
|
||||
return l10n_util::GetStringUTF16(message_id);
|
||||
}
|
||||
|
||||
base::StringPiece ElectronContentClient::GetDataResource(
|
||||
std::string_view ElectronContentClient::GetDataResource(
|
||||
int resource_id,
|
||||
ui::ResourceScaleFactor scale_factor) {
|
||||
return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale(
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
#ifndef ELECTRON_SHELL_APP_ELECTRON_CONTENT_CLIENT_H_
|
||||
#define ELECTRON_SHELL_APP_ELECTRON_CONTENT_CLIENT_H_
|
||||
|
||||
#include <string_view>
|
||||
#include <vector>
|
||||
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/strings/string_piece.h"
|
||||
#include "content/public/common/content_client.h"
|
||||
|
||||
namespace electron {
|
||||
@@ -25,8 +25,8 @@ class ElectronContentClient : public content::ContentClient {
|
||||
protected:
|
||||
// content::ContentClient:
|
||||
std::u16string GetLocalizedString(int message_id) override;
|
||||
base::StringPiece GetDataResource(int resource_id,
|
||||
ui::ResourceScaleFactor) override;
|
||||
std::string_view GetDataResource(int resource_id,
|
||||
ui::ResourceScaleFactor) override;
|
||||
gfx::Image& GetNativeImageNamed(int resource_id) override;
|
||||
base::RefCountedMemory* GetDataResourceBytes(int resource_id) override;
|
||||
void AddAdditionalSchemes(Schemes* schemes) override;
|
||||
|
||||
@@ -411,7 +411,7 @@ std::optional<int> ElectronMainDelegate::PreBrowserMain() {
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
base::StringPiece ElectronMainDelegate::GetBrowserV8SnapshotFilename() {
|
||||
std::string_view ElectronMainDelegate::GetBrowserV8SnapshotFilename() {
|
||||
bool load_browser_process_specific_v8_snapshot =
|
||||
IsBrowserProcess() &&
|
||||
electron::fuses::IsLoadBrowserProcessSpecificV8SnapshotEnabled();
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
#include "content/public/app/content_main_delegate.h"
|
||||
|
||||
@@ -35,7 +36,7 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
|
||||
|
||||
protected:
|
||||
// content::ContentMainDelegate:
|
||||
base::StringPiece GetBrowserV8SnapshotFilename() override;
|
||||
std::string_view GetBrowserV8SnapshotFilename() override;
|
||||
std::optional<int> BasicStartupComplete() override;
|
||||
void PreSandboxStartup() override;
|
||||
void SandboxInitialized(const std::string& process_type) override;
|
||||
|
||||
Reference in New Issue
Block a user