diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-09-01 11:08:40 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-01 12:16:21 +0000 |
| commit | 03c549e0392f92c02536d3f86d5e1d8dfa3435ac (patch) | |
| tree | fe49d170a929b34ba82cd10db1a0bd8e3760fa4b /chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h | |
| parent | 5d013f5804a0d91fcf6c626b2d6fb6eca5c845b0 (diff) | |
BASELINE: Update Chromium to 91.0.4472.160
Change-Id: I0def1f08a2412aeed79a9ab95dd50eb5c3f65f31
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h')
| -rw-r--r-- | chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h index c5a86f87f42..ce32761a495 100644 --- a/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h +++ b/chromium/chrome/browser/extensions/api/content_settings/content_settings_service.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/scoped_observer.h" +#include "base/scoped_observation.h" #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_prefs.h" @@ -59,7 +59,8 @@ class ContentSettingsService : public BrowserContextKeyedAPI, static const char* service_name() { return "ContentSettingsService"; } scoped_refptr<ContentSettingsStore> content_settings_store_; - ScopedObserver<ExtensionPrefs, ExtensionPrefsObserver> scoped_observer_{this}; + base::ScopedObservation<ExtensionPrefs, ExtensionPrefsObserver> + scoped_observation_{this}; DISALLOW_COPY_AND_ASSIGN(ContentSettingsService); }; |