diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/developer_private')
4 files changed, 21 insertions, 29 deletions
diff --git a/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.cc index 6cd0dd1f2f8..d08f651ecdf 100644 --- a/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -20,6 +20,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/post_task.h" +#include "chrome/browser/apps/app_service/app_launch_params.h" #include "chrome/browser/devtools/devtools_window.h" #include "chrome/browser/extensions/api/developer_private/developer_private_mangle.h" #include "chrome/browser/extensions/api/developer_private/entry_picker.h" @@ -46,7 +47,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/apps/app_info_dialog.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/extensions/app_launch_params.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/api/developer_private.h" @@ -325,7 +325,7 @@ std::unique_ptr<developer::ProfileInfo> DeveloperPrivateAPI::CreateProfileInfo( info->in_developer_mode = !info->is_supervised && prefs->GetBoolean(prefs::kExtensionsUIDeveloperMode); - info->app_info_dialog_enabled = CanShowAppInfoDialog(); + info->app_info_dialog_enabled = CanPlatformShowAppInfoDialog(); info->can_load_unpacked = ExtensionManagementFactory::GetForBrowserContext(profile) ->HasWhitelistedExtension(); @@ -358,16 +358,7 @@ DeveloperPrivateAPI::DeveloperPrivateAPI(content::BrowserContext* context) } DeveloperPrivateEventRouter::DeveloperPrivateEventRouter(Profile* profile) - : extension_registry_observer_(this), - error_console_observer_(this), - process_manager_observer_(this), - app_window_registry_observer_(this), - warning_service_observer_(this), - extension_prefs_observer_(this), - extension_management_observer_(this), - command_service_observer_(this), - profile_(profile), - event_router_(EventRouter::Get(profile_)) { + : profile_(profile), event_router_(EventRouter::Get(profile_)) { extension_registry_observer_.Add(ExtensionRegistry::Get(profile_)); error_console_observer_.Add(ErrorConsole::Get(profile)); process_manager_observer_.Add(ProcessManager::Get(profile)); @@ -955,9 +946,8 @@ DeveloperPrivateUpdateExtensionConfigurationFunction::Run() { return RespondNow(NoArguments()); } -DeveloperPrivateReloadFunction::DeveloperPrivateReloadFunction() - : registry_observer_(this), error_reporter_observer_(this) {} -DeveloperPrivateReloadFunction::~DeveloperPrivateReloadFunction() {} +DeveloperPrivateReloadFunction::DeveloperPrivateReloadFunction() = default; +DeveloperPrivateReloadFunction::~DeveloperPrivateReloadFunction() = default; ExtensionFunction::ResponseAction DeveloperPrivateReloadFunction::Run() { std::unique_ptr<Reload::Params> params(Reload::Params::Create(*args_)); diff --git a/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.h index 639cf9e4777..33955e23630 100644 --- a/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.h +++ b/chromium/chrome/browser/extensions/api/developer_private/developer_private_api.h @@ -30,8 +30,11 @@ #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_function.h" +#include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_observer.h" +#include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" +#include "extensions/browser/process_manager.h" #include "extensions/browser/process_manager_observer.h" #include "extensions/browser/warning_service.h" #include "storage/browser/fileapi/file_system_context.h" @@ -45,8 +48,6 @@ namespace extensions { class EventRouter; class ExtensionError; class ExtensionInfoGenerator; -class ExtensionRegistry; -class ProcessManager; namespace api { @@ -144,20 +145,21 @@ class DeveloperPrivateEventRouter : public ExtensionRegistryObserver, std::vector<api::developer_private::ExtensionInfo> infos); ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> - extension_registry_observer_; - ScopedObserver<ErrorConsole, ErrorConsole::Observer> error_console_observer_; + extension_registry_observer_{this}; + ScopedObserver<ErrorConsole, ErrorConsole::Observer> error_console_observer_{ + this}; ScopedObserver<ProcessManager, ProcessManagerObserver> - process_manager_observer_; + process_manager_observer_{this}; ScopedObserver<AppWindowRegistry, AppWindowRegistry::Observer> - app_window_registry_observer_; + app_window_registry_observer_{this}; ScopedObserver<WarningService, WarningService::Observer> - warning_service_observer_; + warning_service_observer_{this}; ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver> - extension_prefs_observer_; + extension_prefs_observer_{this}; ScopedObserver<ExtensionManagement, ExtensionManagement::Observer> - extension_management_observer_; + extension_management_observer_{this}; ScopedObserver<CommandService, CommandService::Observer> - command_service_observer_; + command_service_observer_{this}; Profile* profile_; @@ -464,9 +466,9 @@ class DeveloperPrivateReloadFunction : public DeveloperPrivateAPIFunction, base::FilePath reloading_extension_path_; ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> - registry_observer_; + registry_observer_{this}; ScopedObserver<LoadErrorReporter, LoadErrorReporter::Observer> - error_reporter_observer_; + error_reporter_observer_{this}; DISALLOW_COPY_AND_ASSIGN(DeveloperPrivateReloadFunction); }; diff --git a/chromium/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc b/chromium/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc index cf68ed7c110..62b206bf7ab 100644 --- a/chromium/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc +++ b/chromium/chrome/browser/extensions/api/developer_private/extension_info_generator_unittest.cc @@ -80,7 +80,7 @@ std::string SiteControlsToString( list.GetList().reserve(controls.size()); for (const auto& control : controls) { std::unique_ptr<base::Value> control_value = control.ToValue(); - list.GetList().push_back(std::move(*control_value)); + list.Append(std::move(*control_value)); } std::string json; diff --git a/chromium/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.cc b/chromium/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.cc index 4d719aaff50..a81a0674b73 100644 --- a/chromium/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.cc +++ b/chromium/chrome/browser/extensions/api/developer_private/show_permissions_dialog_helper.cc @@ -40,7 +40,7 @@ void ShowPermissionsDialogHelper::Show(content::BrowserContext* browser_context, // Show the new-style extensions dialog when it is available. It is currently // unavailable by default on Mac. - if (CanShowAppInfoDialog()) { + if (CanPlatformShowAppInfoDialog()) { if (from_webui) { UMA_HISTOGRAM_ENUMERATION("Apps.AppInfoDialog.Launches", AppInfoLaunchSource::FROM_EXTENSIONS_PAGE, |