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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 982413002: base: Stop passing a non-const ref to ObserverListBase::Iterator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: observerref: fixwindowsbuild Created 5 years, 9 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
« no previous file with comments | « content/public/test/mock_render_thread.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
952 952
953 bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) { 953 bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
954 // TODO(kenrb): document() should not be null, but as a transitional step 954 // TODO(kenrb): document() should not be null, but as a transitional step
955 // we have RenderFrameProxy 'wrapping' a RenderFrameImpl, passing messages 955 // we have RenderFrameProxy 'wrapping' a RenderFrameImpl, passing messages
956 // to this method. This happens for a top-level remote frame, where a 956 // to this method. This happens for a top-level remote frame, where a
957 // document-less RenderFrame is replaced by a RenderFrameProxy but kept 957 // document-less RenderFrame is replaced by a RenderFrameProxy but kept
958 // around and is still able to receive messages. 958 // around and is still able to receive messages.
959 if (!frame_->document().isNull()) 959 if (!frame_->document().isNull())
960 GetContentClient()->SetActiveURL(frame_->document().url()); 960 GetContentClient()->SetActiveURL(frame_->document().url());
961 961
962 ObserverListBase<RenderFrameObserver>::Iterator it(observers_); 962 ObserverListBase<RenderFrameObserver>::Iterator it(&observers_);
963 RenderFrameObserver* observer; 963 RenderFrameObserver* observer;
964 while ((observer = it.GetNext()) != NULL) { 964 while ((observer = it.GetNext()) != NULL) {
965 if (observer->OnMessageReceived(msg)) 965 if (observer->OnMessageReceived(msg))
966 return true; 966 return true;
967 } 967 }
968 968
969 bool handled = true; 969 bool handled = true;
970 IPC_BEGIN_MESSAGE_MAP(RenderFrameImpl, msg) 970 IPC_BEGIN_MESSAGE_MAP(RenderFrameImpl, msg)
971 IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate) 971 IPC_MESSAGE_HANDLER(FrameMsg_Navigate, OnNavigate)
972 IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload) 972 IPC_MESSAGE_HANDLER(FrameMsg_BeforeUnload, OnBeforeUnload)
(...skipping 3526 matching lines...) Expand 10 before | Expand all | Expand 10 after
4499 4499
4500 #if defined(ENABLE_BROWSER_CDMS) 4500 #if defined(ENABLE_BROWSER_CDMS)
4501 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4501 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4502 if (!cdm_manager_) 4502 if (!cdm_manager_)
4503 cdm_manager_ = new RendererCdmManager(this); 4503 cdm_manager_ = new RendererCdmManager(this);
4504 return cdm_manager_; 4504 return cdm_manager_;
4505 } 4505 }
4506 #endif // defined(ENABLE_BROWSER_CDMS) 4506 #endif // defined(ENABLE_BROWSER_CDMS)
4507 4507
4508 } // namespace content 4508 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/mock_render_thread.cc ('k') | content/renderer/render_thread_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698