diff options
| author | brettw <brettw@chromium.org> | 2015-06-03 09:31:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-03 16:32:08 +0000 |
| commit | 236d317f450601fbb56756b0b5ca802659a045f6 (patch) | |
| tree | 086f7f2ed78889e4dc2c17f209871ba364bc9c01 /components/content_settings | |
| parent | e7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff) | |
| download | chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.zip chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.gz chromium_src-236d317f450601fbb56756b0b5ca802659a045f6.tar.bz2 | |
Replace more ObserverList with base::ObserverList.
This is everything but the chrome directory
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
TBR=zelidrag@chromium.org (chromeos)
TBR=keybuk@chromium.org (device/bluetooth)
Review URL: https://codereview.chromium.org/1162943002
Cr-Commit-Position: refs/heads/master@{#332626}
Diffstat (limited to 'components/content_settings')
| -rw-r--r-- | components/content_settings/core/browser/content_settings_observable_provider.h | 2 | ||||
| -rw-r--r-- | components/content_settings/core/browser/host_content_settings_map.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/components/content_settings/core/browser/content_settings_observable_provider.h b/components/content_settings/core/browser/content_settings_observable_provider.h index cb6a01dd..84f01f2 100644 --- a/components/content_settings/core/browser/content_settings_observable_provider.h +++ b/components/content_settings/core/browser/content_settings_observable_provider.h @@ -33,7 +33,7 @@ class ObservableProvider : public ProviderInterface { private: base::ThreadChecker thread_checker_; - ObserverList<Observer, true> observer_list_; + base::ObserverList<Observer, true> observer_list_; }; } // namespace content_settings diff --git a/components/content_settings/core/browser/host_content_settings_map.h b/components/content_settings/core/browser/host_content_settings_map.h index 9566883..c77192c 100644 --- a/components/content_settings/core/browser/host_content_settings_map.h +++ b/components/content_settings/core/browser/host_content_settings_map.h @@ -361,7 +361,7 @@ class HostContentSettingsMap base::ThreadChecker thread_checker_; - ObserverList<content_settings::Observer> observers_; + base::ObserverList<content_settings::Observer> observers_; DISALLOW_COPY_AND_ASSIGN(HostContentSettingsMap); }; |