Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1003)

Unified Diff: content/browser/loader/resource_dispatcher_host_impl.cc

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/browser/media/webrtc_internals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_dispatcher_host_impl.cc
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc
index c49cb3c6deceb5973737411f63c89794173a60fb..9a5b4a2f25ef0d74ee51739346db51964ddcaf29 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.cc
+++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -989,7 +989,7 @@ bool ResourceDispatcherHostImpl::OnMessageReceived(
GlobalRequestID id(filter_->child_id(), request_id);
DelegateMap::iterator it = delegate_map_.find(id);
if (it != delegate_map_.end()) {
- ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+ base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
ResourceMessageDelegate* delegate;
while (!handled && (delegate = del_it.GetNext()) != NULL) {
handled = delegate->OnMessageReceived(message);
@@ -1096,7 +1096,7 @@ void ResourceDispatcherHostImpl::UpdateRequestForTransfer(
DelegateMap::iterator it = delegate_map_.find(old_request_id);
if (it != delegate_map_.end()) {
// Tell each delegate that the request ID has changed.
- ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
+ base::ObserverList<ResourceMessageDelegate>::Iterator del_it(it->second);
ResourceMessageDelegate* delegate;
while ((delegate = del_it.GetNext()) != NULL) {
delegate->set_request_id(new_request_id);
@@ -2310,7 +2310,10 @@ void ResourceDispatcherHostImpl::RegisterResourceMessageDelegate(
DelegateMap::iterator it = delegate_map_.find(id);
if (it == delegate_map_.end()) {
it = delegate_map_.insert(
- std::make_pair(id, new ObserverList<ResourceMessageDelegate>)).first;
+ std::make_pair(
+ id,
+ new base::ObserverList<ResourceMessageDelegate>))
+ .first;
}
it->second->AddObserver(delegate);
}
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.h ('k') | content/browser/media/webrtc_internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698