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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2410283004: Remove usage of base::ObserverList<T>::Iter::GetNext() in //content. (Closed)
Patch Set: Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 668
669 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, 669 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
670 RenderFrameHost* render_frame_host, 670 RenderFrameHost* render_frame_host,
671 const IPC::Message& message) { 671 const IPC::Message& message) {
672 DCHECK(render_view_host || render_frame_host); 672 DCHECK(render_view_host || render_frame_host);
673 if (GetWebUI() && 673 if (GetWebUI() &&
674 static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) { 674 static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) {
675 return true; 675 return true;
676 } 676 }
677 677
678 base::ObserverListBase<WebContentsObserver>::Iterator it(&observers_);
679 WebContentsObserver* observer;
680 if (render_frame_host) { 678 if (render_frame_host) {
681 while ((observer = it.GetNext()) != NULL) 679 for (auto& observer : observers_) {
682 if (observer->OnMessageReceived(message, render_frame_host)) 680 if (observer.OnMessageReceived(message, render_frame_host))
683 return true; 681 return true;
682 }
684 } else { 683 } else {
685 while ((observer = it.GetNext()) != NULL) 684 for (auto& observer : observers_) {
686 if (observer->OnMessageReceived(message)) 685 if (observer.OnMessageReceived(message))
687 return true; 686 return true;
687 }
688 } 688 }
689 689
690 // Message handlers should be aware of which 690 // Message handlers should be aware of which
691 // RenderViewHost/RenderFrameHost sent the message, which is temporarily 691 // RenderViewHost/RenderFrameHost sent the message, which is temporarily
692 // stored in render_(view|frame)_message_source_. 692 // stored in render_(view|frame)_message_source_.
693 if (render_frame_host) 693 if (render_frame_host)
694 render_frame_message_source_ = render_frame_host; 694 render_frame_message_source_ = render_frame_host;
695 else 695 else
696 render_view_message_source_ = render_view_host; 696 render_view_message_source_ = render_view_host;
697 697
(...skipping 4580 matching lines...) Expand 10 before | Expand all | Expand 10 after
5278 dialog_manager_ = dialog_manager; 5278 dialog_manager_ = dialog_manager;
5279 } 5279 }
5280 5280
5281 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) { 5281 void WebContentsImpl::RemoveBindingSet(const std::string& interface_name) {
5282 auto it = binding_sets_.find(interface_name); 5282 auto it = binding_sets_.find(interface_name);
5283 if (it != binding_sets_.end()) 5283 if (it != binding_sets_.end())
5284 binding_sets_.erase(it); 5284 binding_sets_.erase(it);
5285 } 5285 }
5286 5286
5287 } // namespace content 5287 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698