Browse Source

refactor: ExtensionUserScriptManager is now UserScriptManager

Refs: https://chromium-review.googlesource.com/c/chromium/src/+/2657617
Samuel Attard 4 years ago
parent
commit
2fed02556d

+ 6 - 6
shell/browser/extensions/electron_extension_system.cc

@@ -24,7 +24,6 @@
 #include "electron/buildflags/buildflags.h"
 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
 #include "extensions/browser/extension_registry.h"
-#include "extensions/browser/extension_user_script_manager.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/notification_types.h"
@@ -32,6 +31,7 @@
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/service_worker_manager.h"
+#include "extensions/browser/user_script_manager.h"
 #include "extensions/browser/value_store/value_store_factory_impl.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/file_util.h"
@@ -84,8 +84,8 @@ void ElectronExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
   runtime_data_ =
       std::make_unique<RuntimeData>(ExtensionRegistry::Get(browser_context_));
   quota_service_ = std::make_unique<QuotaService>();
-  extension_user_script_manager_ =
-      std::make_unique<ExtensionUserScriptManager>(browser_context_);
+  user_script_manager_ =
+      std::make_unique<UserScriptManager>(browser_context_);
   app_sorting_ = std::make_unique<NullAppSorting>();
   extension_loader_ =
       std::make_unique<ElectronExtensionLoader>(browser_context_);
@@ -140,9 +140,9 @@ ServiceWorkerManager* ElectronExtensionSystem::service_worker_manager() {
   return service_worker_manager_.get();
 }
 
-ExtensionUserScriptManager*
-ElectronExtensionSystem::extension_user_script_manager() {
-  return new ExtensionUserScriptManager(browser_context_);
+UserScriptManager*
+ElectronExtensionSystem::user_script_manager() {
+  return new UserScriptManager(browser_context_);
 }
 
 StateStore* ElectronExtensionSystem::state_store() {

+ 2 - 2
shell/browser/extensions/electron_extension_system.h

@@ -61,7 +61,7 @@ class ElectronExtensionSystem : public ExtensionSystem {
   RuntimeData* runtime_data() override;
   ManagementPolicy* management_policy() override;
   ServiceWorkerManager* service_worker_manager() override;
-  ExtensionUserScriptManager* extension_user_script_manager() override;
+  UserScriptManager* user_script_manager() override;
   StateStore* state_store() override;
   StateStore* rules_store() override;
   scoped_refptr<ValueStoreFactory> store_factory() override;
@@ -103,7 +103,7 @@ class ElectronExtensionSystem : public ExtensionSystem {
   std::unique_ptr<ServiceWorkerManager> service_worker_manager_;
   std::unique_ptr<RuntimeData> runtime_data_;
   std::unique_ptr<QuotaService> quota_service_;
-  std::unique_ptr<ExtensionUserScriptManager> extension_user_script_manager_;
+  std::unique_ptr<UserScriptManager> user_script_manager_;
   std::unique_ptr<AppSorting> app_sorting_;
   std::unique_ptr<ManagementPolicy> management_policy_;