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

Side by Side Diff: content/browser/web_contents/web_contents_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
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 <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 502
503 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host, 503 bool WebContentsImpl::OnMessageReceived(RenderViewHost* render_view_host,
504 RenderFrameHost* render_frame_host, 504 RenderFrameHost* render_frame_host,
505 const IPC::Message& message) { 505 const IPC::Message& message) {
506 DCHECK(render_view_host || render_frame_host); 506 DCHECK(render_view_host || render_frame_host);
507 if (GetWebUI() && 507 if (GetWebUI() &&
508 static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) { 508 static_cast<WebUIImpl*>(GetWebUI())->OnMessageReceived(message)) {
509 return true; 509 return true;
510 } 510 }
511 511
512 ObserverListBase<WebContentsObserver>::Iterator it(observers_); 512 ObserverListBase<WebContentsObserver>::Iterator it(&observers_);
513 WebContentsObserver* observer; 513 WebContentsObserver* observer;
514 if (render_frame_host) { 514 if (render_frame_host) {
515 while ((observer = it.GetNext()) != NULL) 515 while ((observer = it.GetNext()) != NULL)
516 if (observer->OnMessageReceived(message, render_frame_host)) 516 if (observer->OnMessageReceived(message, render_frame_host))
517 return true; 517 return true;
518 } else { 518 } else {
519 while ((observer = it.GetNext()) != NULL) 519 while ((observer = it.GetNext()) != NULL)
520 if (observer->OnMessageReceived(message)) 520 if (observer->OnMessageReceived(message))
521 return true; 521 return true;
522 } 522 }
(...skipping 4033 matching lines...) Expand 10 before | Expand all | Expand 10 after
4556 node->render_manager()->ResumeResponseDeferredAtStart(); 4556 node->render_manager()->ResumeResponseDeferredAtStart();
4557 } 4557 }
4558 4558
4559 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { 4559 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) {
4560 force_disable_overscroll_content_ = force_disable; 4560 force_disable_overscroll_content_ = force_disable;
4561 if (view_) 4561 if (view_)
4562 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); 4562 view_->SetOverscrollControllerEnabled(CanOverscrollContent());
4563 } 4563 }
4564 4564
4565 } // namespace content 4565 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/service_worker/embedded_worker_instance.cc ('k') | content/public/test/mock_render_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698