chore: bump chromium to 4563763ef26ad940d4e988d7245dd (master) (#23219)

* chore: bump chromium in DEPS to 461ecae368fd0832f18e0b13e61f3561d83f0031

* update patches

* update patches

* Remove both vs browser/child split in content gn files.

2157965

* chore: bump chromium in DEPS to 7ff3897f3104563763ef26ad940d4e988d7245dd

* update patches

* update patches

* Add ElectronKioskDelegate for extensions

2159760

Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
This commit is contained in:
Electron Bot 2020-04-23 18:55:17 -07:00 committed by GitHub
parent 176a120ec2
commit 37db307153
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 226 additions and 174 deletions

View file

@ -45,6 +45,7 @@
#include "shell/browser/extensions/electron_extension_web_contents_observer.h"
#include "shell/browser/extensions/electron_extensions_api_client.h"
#include "shell/browser/extensions/electron_extensions_browser_api_provider.h"
#include "shell/browser/extensions/electron_kiosk_delegate.h"
#include "shell/browser/extensions/electron_navigation_ui_data.h"
#include "shell/browser/extensions/electron_process_manager_delegate.h"
#include "ui/base/resource/resource_bundle.h"
@ -346,7 +347,9 @@ ElectronExtensionsBrowserClient::GetExtensionWebContentsObserver(
}
extensions::KioskDelegate* ElectronExtensionsBrowserClient::GetKioskDelegate() {
return nullptr;
if (!kiosk_delegate_)
kiosk_delegate_.reset(new ElectronKioskDelegate());
return kiosk_delegate_.get();
}
bool ElectronExtensionsBrowserClient::IsLockScreenContext(

View file

@ -13,6 +13,7 @@
#include "base/macros.h"
#include "build/build_config.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/kiosk/kiosk_delegate.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "third_party/blink/public/mojom/loader/resource_load_info.mojom-shared.h"
@ -140,6 +141,8 @@ class ElectronExtensionsBrowserClient
// The extension cache used for download and installation.
std::unique_ptr<extensions::ExtensionCache> extension_cache_;
std::unique_ptr<extensions::KioskDelegate> kiosk_delegate_;
std::unique_ptr<extensions::ElectronComponentExtensionResourceManager>
resource_manager_;

View file

@ -0,0 +1,18 @@
// Copyright 2016 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_kiosk_delegate.h"
namespace electron {
ElectronKioskDelegate::ElectronKioskDelegate() {}
ElectronKioskDelegate::~ElectronKioskDelegate() {}
bool ElectronKioskDelegate::IsAutoLaunchedKioskApp(
const extensions::ExtensionId& id) const {
return false;
}
} // namespace electron

View file

@ -0,0 +1,26 @@
// Copyright 2016 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 SHELL_BROWSER_EXTENSIONS_ELECTRON_KIOSK_DELEGATE_H_
#define SHELL_BROWSER_EXTENSIONS_ELECTRON_KIOSK_DELEGATE_H_
#include "extensions/browser/kiosk/kiosk_delegate.h"
#include "extensions/common/extension_id.h"
namespace electron {
// Delegate in Electron that provides an extension/app API with Kiosk mode
// functionality.
class ElectronKioskDelegate : public extensions::KioskDelegate {
public:
ElectronKioskDelegate();
~ElectronKioskDelegate() override;
// KioskDelegate overrides:
bool IsAutoLaunchedKioskApp(const extensions::ExtensionId& id) const override;
};
} // namespace electron
#endif // SHELL_BROWSER_EXTENSIONS_ELECTRON_KIOSK_DELEGATE_H_