diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 17:21:03 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-23 16:25:15 +0000 |
commit | c551f43206405019121bd2b2c93714319a0a3300 (patch) | |
tree | 1f48c30631c421fd4bbb3c36da20183c8a2ed7d7 /chromium/chrome/browser/extensions/api/settings_overrides | |
parent | 7961cea6d1041e3e454dae6a1da660b453efd238 (diff) |
BASELINE: Update Chromium to 79.0.3945.139
Change-Id: I336b7182fab9bca80b709682489c07db112eaca5
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/settings_overrides')
-rw-r--r-- | chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc | 4 | ||||
-rw-r--r-- | chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc index 706e3a5b7ab..a9d7d9a853b 100644 --- a/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc +++ b/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc @@ -22,7 +22,6 @@ #include "components/search_engines/template_url_prepopulate_data.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_prefs_factory.h" -#include "extensions/browser/extension_registry.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" @@ -110,8 +109,7 @@ std::unique_ptr<TemplateURLData> ConvertSearchProvider( SettingsOverridesAPI::SettingsOverridesAPI(content::BrowserContext* context) : profile_(Profile::FromBrowserContext(context)), - url_service_(TemplateURLServiceFactory::GetForProfile(profile_)), - extension_registry_observer_(this) { + url_service_(TemplateURLServiceFactory::GetForProfile(profile_)) { extension_registry_observer_.Add(ExtensionRegistry::Get(profile_)); } diff --git a/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h b/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h index 3c80f897680..baf7419ef7b 100644 --- a/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h +++ b/chromium/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h @@ -13,12 +13,12 @@ #include "base/scoped_observer.h" #include "components/search_engines/template_url_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h" +#include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" class Profile; namespace extensions { -class ExtensionRegistry; class SettingsOverridesAPI : public BrowserContextKeyedAPI, public ExtensionRegistryObserver { @@ -56,7 +56,7 @@ class SettingsOverridesAPI : public BrowserContextKeyedAPI, // Listen to extension load, unloaded notifications. ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver> - extension_registry_observer_; + extension_registry_observer_{this}; DISALLOW_COPY_AND_ASSIGN(SettingsOverridesAPI); }; |