summaryrefslogtreecommitdiffstats
path: root/extensions/browser/app_window
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-03 09:31:43 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-03 16:32:08 +0000
commit236d317f450601fbb56756b0b5ca802659a045f6 (patch)
tree086f7f2ed78889e4dc2c17f209871ba364bc9c01 /extensions/browser/app_window
parente7938cf52a9aeb936c1cb005faaafb9f2b16cd4f (diff)
downloadchromium_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 'extensions/browser/app_window')
-rw-r--r--extensions/browser/app_window/app_window_geometry_cache.h2
-rw-r--r--extensions/browser/app_window/app_window_registry.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/browser/app_window/app_window_geometry_cache.h b/extensions/browser/app_window/app_window_geometry_cache.h
index 89732f4..314db45 100644
--- a/extensions/browser/app_window/app_window_geometry_cache.h
+++ b/extensions/browser/app_window/app_window_geometry_cache.h
@@ -149,7 +149,7 @@ class AppWindowGeometryCache : public KeyedService,
ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
extension_registry_observer_;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
};
} // namespace extensions
diff --git a/extensions/browser/app_window/app_window_registry.h b/extensions/browser/app_window/app_window_registry.h
index ed2cdc6..fc9cc19 100644
--- a/extensions/browser/app_window/app_window_registry.h
+++ b/extensions/browser/app_window/app_window_registry.h
@@ -138,7 +138,7 @@ class AppWindowRegistry : public KeyedService {
content::BrowserContext* context_;
AppWindowList app_windows_;
InspectedWindowSet inspected_windows_;
- ObserverList<Observer> observers_;
+ base::ObserverList<Observer> observers_;
base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
};