mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
81c143318b
* chore: bump chromium in DEPS to 94.0.4587.0
* chore: update patches
* 2823155: fix GPU video decoding capabilities enumeration
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/2823155
* 3041383: Reduce includes in url_request_mojom_traits.h
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3041383
* chore: bump chromium in DEPS to 94.0.4588.0
* chore: update patches
* chore: bump chromium in DEPS to 94.0.4589.0
* chore: update patches
* 3050633: Rename ScaleFactor to ResourceScaleFactor
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3050633
* 3048296: Create new mojo target to prevent traits header spreading
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3048296
* 3046186: Rename base::ClampToRange
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3046186
* chore: update picture-in-picture patch
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3056037
* chore: bump chromium in DEPS to 94.0.4590.0
* chore: update patches
* 3057495: Fix base::NoDestructor usage in Mac KeychainPassword
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3057495
* 3056134: Remove NetworkIsolationKey unused methods
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3056134
* 3035091: [rab/gsab] Fix gsab maxByteLength after transferring to worker
Adds a patch to v8 to disable a DCHECK that is also firing on node streams
in child processes.
Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3035091
* chore: bump chromium in DEPS to 94.0.4590.2
* chore: fix mas_no_private_api.patch
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3049052
* 3049555: [views] Add CHECK to prevent fallthrough to global NativeTheme
Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3049555
* chore: empty commit
* chore: fix whitespace for lint
* chore: cherry-pick chromium woa fix
* Revert "chore: cherry-pick chromium woa fix"
This reverts commit 64f3082e2d.
* chore: fix the build on Windows on ARM
* chore: remove commented code in printing.patch
* fixup! chore: remove commented code in printing.patch
do not remove the new weak_ptr check
* build: sync disable_use_lld_for_macos.patch
Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <khammond@slack-corp.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
41 lines
1.3 KiB
C++
41 lines
1.3 KiB
C++
// Copyright (c) 2014 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#ifndef SHELL_APP_ELECTRON_CONTENT_CLIENT_H_
|
|
#define SHELL_APP_ELECTRON_CONTENT_CLIENT_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "base/files/file_path.h"
|
|
#include "content/public/common/content_client.h"
|
|
|
|
namespace electron {
|
|
|
|
class ElectronContentClient : public content::ContentClient {
|
|
public:
|
|
ElectronContentClient();
|
|
~ElectronContentClient() override;
|
|
|
|
protected:
|
|
// content::ContentClient:
|
|
std::u16string GetLocalizedString(int message_id) override;
|
|
base::StringPiece 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;
|
|
void AddPepperPlugins(
|
|
std::vector<content::PepperPluginInfo>* plugins) override;
|
|
void AddContentDecryptionModules(
|
|
std::vector<content::CdmInfo>* cdms,
|
|
std::vector<media::CdmHostFilePath>* cdm_host_file_paths) override;
|
|
|
|
private:
|
|
DISALLOW_COPY_AND_ASSIGN(ElectronContentClient);
|
|
};
|
|
|
|
} // namespace electron
|
|
|
|
#endif // SHELL_APP_ELECTRON_CONTENT_CLIENT_H_
|