mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: broken chrome.scripting compilation (#39725)

Browse source 
fix: broken chrome.scripting impl after roll
This commit is contained in:
Shelley Vohr 2023-09-04 09:03:10 +02:00 • committed by GitHub
parent 89659fa9c9
commit 54d8402a6c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 264 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/extensions/api/scripting/scripting_api.h
View file

@ -11,6 +11,7 @@
#include <vector>
#include "chrome/common/extensions/api/scripting.h"
#include "extensions/browser/api/scripting/scripting_utils.h"
#include "extensions/browser/extension_function.h"
#include "extensions/browser/script_executor.h"
#include "extensions/common/mojom/code_injection.mojom.h"
@ -108,9 +109,6 @@ class ScriptingRemoveCSSFunction : public ExtensionFunction {
void OnCSSRemoved(std::vector<ScriptExecutor::FrameResult> results);
};
using ValidateContentScriptsResult =
std::pair<std::unique_ptr<UserScriptList>, absl::optional<std::string>>;
class ScriptingRegisterContentScriptsFunction : public ExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("scripting.registerContentScripts",
@ -131,7 +129,7 @@ class ScriptingRegisterContentScriptsFunction : public ExtensionFunction {
// Called when script files have been checked.
void OnContentScriptFilesValidated(
std::set<std::string> persistent_script_ids,
ValidateContentScriptsResult result);
scripting::ValidateScriptsResult result);
// Called when content scripts have been registered.
void OnContentScriptsRegistered(const absl::optional<std::string>& error);
@ -196,7 +194,7 @@ class ScriptingUpdateContentScriptsFunction : public ExtensionFunction {
// Called when script files have been checked.
void OnContentScriptFilesValidated(
std::set<std::string> persistent_script_ids,
ValidateContentScriptsResult result);
scripting::ValidateScriptsResult result);
// Called when content scripts have been updated.
void OnContentScriptsUpdated(const absl::optional<std::string>& error);