chore: bump chromium to 135.0.7027.0 (main) (#45677)
* chore: bump chromium in DEPS to 135.0.7021.0 * chore: bump chromium in DEPS to 135.0.7023.0 * chore: update patches * chore: gen-libc++-filenames.js * [Extensions] Add a BUILD.gn file for the chrome.system.display API. Refs6227347
* chore: bump chromium in DEPS to 135.0.7025.0 * fixup! [Extensions] Add a BUILD.gn file for the chrome.system.display API. * [DevTools] Add support for automatic workspace folders. Refs6275926
* Add UseCounter for potential PNA 2.0 breakage Refs6259197
* Remove references to NavigationEntry/Controller in Zoom code. Refs6258070
* chore: update patches * Allow DevTools to record UmaHistogramMediumTimes Refs6183713
* chore: update patches * [gpu] Remove unnecessary media_buildflags include Refs6286526
* chore: bump chromium in DEPS to 135.0.7027.0 * chore: update patches * Remove type alias Refs6280957
* [Refactor] Make ExtensionRegistrar a browser keyed service. Refs6285230
* Remove unused functions Refs6278736
* chore: IWYU --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
parent
6248c2436a
commit
612da3ec47
78 changed files with 347 additions and 575 deletions
|
@ -1,11 +0,0 @@
|
|||
// 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_display_info_provider.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
ElectronDisplayInfoProvider::ElectronDisplayInfoProvider() = default;
|
||||
|
||||
} // namespace extensions
|
|
@ -1,24 +0,0 @@
|
|||
// 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.
|
||||
|
||||
#ifndef ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_DISPLAY_INFO_PROVIDER_H_
|
||||
#define ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_DISPLAY_INFO_PROVIDER_H_
|
||||
|
||||
#include "extensions/browser/api/system_display/display_info_provider.h"
|
||||
|
||||
namespace extensions {
|
||||
|
||||
class ElectronDisplayInfoProvider : public DisplayInfoProvider {
|
||||
public:
|
||||
ElectronDisplayInfoProvider();
|
||||
|
||||
// disable copy
|
||||
ElectronDisplayInfoProvider(const ElectronDisplayInfoProvider&) = delete;
|
||||
ElectronDisplayInfoProvider& operator=(const ElectronDisplayInfoProvider&) =
|
||||
delete;
|
||||
};
|
||||
|
||||
} // namespace extensions
|
||||
|
||||
#endif // ELECTRON_SHELL_BROWSER_EXTENSIONS_ELECTRON_DISPLAY_INFO_PROVIDER_H_
|
|
@ -94,7 +94,9 @@ std::pair<scoped_refptr<const Extension>, std::string> LoadUnpacked(
|
|||
ElectronExtensionLoader::ElectronExtensionLoader(
|
||||
content::BrowserContext* browser_context)
|
||||
: browser_context_(browser_context),
|
||||
extension_registrar_(browser_context, this) {}
|
||||
extension_registrar_(ExtensionRegistrar::Get(browser_context)) {
|
||||
extension_registrar_->SetDelegate(this);
|
||||
}
|
||||
|
||||
ElectronExtensionLoader::~ElectronExtensionLoader() = default;
|
||||
|
||||
|
@ -119,7 +121,8 @@ void ElectronExtensionLoader::ReloadExtension(const ExtensionId& extension_id) {
|
|||
DCHECK_EQ(false, did_schedule_reload_);
|
||||
base::AutoReset<bool> reset_did_schedule_reload(&did_schedule_reload_, false);
|
||||
|
||||
extension_registrar_.ReloadExtension(extension_id, LoadErrorBehavior::kQuiet);
|
||||
extension_registrar_->ReloadExtension(extension_id,
|
||||
LoadErrorBehavior::kQuiet);
|
||||
if (did_schedule_reload_)
|
||||
return;
|
||||
}
|
||||
|
@ -127,7 +130,7 @@ void ElectronExtensionLoader::ReloadExtension(const ExtensionId& extension_id) {
|
|||
void ElectronExtensionLoader::UnloadExtension(
|
||||
const ExtensionId& extension_id,
|
||||
extensions::UnloadedExtensionReason reason) {
|
||||
extension_registrar_.RemoveExtension(extension_id, reason);
|
||||
extension_registrar_->RemoveExtension(extension_id, reason);
|
||||
}
|
||||
|
||||
void ElectronExtensionLoader::FinishExtensionLoad(
|
||||
|
@ -135,7 +138,7 @@ void ElectronExtensionLoader::FinishExtensionLoad(
|
|||
std::pair<scoped_refptr<const Extension>, std::string> result) {
|
||||
scoped_refptr<const Extension> extension = result.first;
|
||||
if (extension) {
|
||||
extension_registrar_.AddExtension(extension);
|
||||
extension_registrar_->AddExtension(extension);
|
||||
|
||||
// Write extension install time to ExtensionPrefs. This is required by
|
||||
// WebRequestAPI which calls extensions::ExtensionPrefs::GetInstallTime.
|
||||
|
@ -163,7 +166,7 @@ void ElectronExtensionLoader::FinishExtensionReload(
|
|||
std::pair<scoped_refptr<const Extension>, std::string> result) {
|
||||
scoped_refptr<const Extension> extension = result.first;
|
||||
if (extension) {
|
||||
extension_registrar_.AddExtension(extension);
|
||||
extension_registrar_->AddExtension(extension);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ class ElectronExtensionLoader : public ExtensionRegistrar::Delegate {
|
|||
void UnloadExtension(const ExtensionId& extension_id,
|
||||
extensions::UnloadedExtensionReason reason);
|
||||
|
||||
ExtensionRegistrar* registrar() { return &extension_registrar_; }
|
||||
raw_ptr<ExtensionRegistrar> registrar() { return extension_registrar_; }
|
||||
|
||||
private:
|
||||
// If the extension loaded successfully, enables it. If it's an app, launches
|
||||
|
@ -92,7 +92,7 @@ class ElectronExtensionLoader : public ExtensionRegistrar::Delegate {
|
|||
raw_ptr<content::BrowserContext> browser_context_; // Not owned.
|
||||
|
||||
// Registers and unregisters extensions.
|
||||
ExtensionRegistrar extension_registrar_;
|
||||
raw_ptr<ExtensionRegistrar> extension_registrar_;
|
||||
|
||||
// Holds keep-alives for relaunching apps.
|
||||
// ShellKeepAliveRequester keep_alive_requester_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue