summaryrefslogtreecommitdiffstats
path: root/ios
diff options
context:
space:
mode:
Diffstat (limited to 'ios')
-rw-r--r--ios/net/cookies/cookie_store_ios.mm2
-rw-r--r--ios/web/active_state_manager_impl.h2
-rw-r--r--ios/web/web_state/web_state_impl.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index 4ccf8b7..bd07150 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -60,7 +60,7 @@ class NotificationTrampoline {
NotificationTrampoline();
~NotificationTrampoline();
- ObserverList<CookieNotificationObserver> observer_list_;
+ base::ObserverList<CookieNotificationObserver> observer_list_;
DISALLOW_COPY_AND_ASSIGN(NotificationTrampoline);
diff --git a/ios/web/active_state_manager_impl.h b/ios/web/active_state_manager_impl.h
index 05efd40..564f55b 100644
--- a/ios/web/active_state_manager_impl.h
+++ b/ios/web/active_state_manager_impl.h
@@ -48,7 +48,7 @@ class ActiveStateManagerImpl : public ActiveStateManager,
// true if the ActiveStateManager is active.
bool active_;
// The list of observers.
- ObserverList<Observer> observer_list_;
+ base::ObserverList<Observer> observer_list_;
DISALLOW_COPY_AND_ASSIGN(ActiveStateManagerImpl);
};
diff --git a/ios/web/web_state/web_state_impl.h b/ios/web/web_state/web_state_impl.h
index 067f96a..ba236ce 100644
--- a/ios/web/web_state/web_state_impl.h
+++ b/ios/web/web_state/web_state_impl.h
@@ -283,7 +283,7 @@ class WebStateImpl : public WebState, public NavigationManagerDelegate {
scoped_ptr<web::WebUIIOS> web_ui_;
// A list of observers notified when page state changes. Weak references.
- ObserverList<WebStateObserver, true> observers_;
+ base::ObserverList<WebStateObserver, true> observers_;
// Map of all the HTTP response headers received, for each URL.
// This map is cleared after each page load, and only the headers of the main