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

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

Issue 266053003: Remove page IDs from three WebContentsObserver APIs that don't need it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with Avi's change Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | content/renderer/render_view_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 1996 matching lines...) Expand 10 before | Expand all | Expand 10 after
2007 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 2007 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
2008 DidFinishDocumentLoad(frame)); 2008 DidFinishDocumentLoad(frame));
2009 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidFinishDocumentLoad()); 2009 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidFinishDocumentLoad());
2010 2010
2011 // Check whether we have new encoding name. 2011 // Check whether we have new encoding name.
2012 render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8()); 2012 render_view_->UpdateEncoding(frame, frame->view()->pageEncoding().utf8());
2013 } 2013 }
2014 2014
2015 void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) { 2015 void RenderFrameImpl::didHandleOnloadEvents(blink::WebLocalFrame* frame) {
2016 DCHECK(!frame_ || frame_ == frame); 2016 DCHECK(!frame_ || frame_ == frame);
2017 if (!frame->parent()) { 2017 if (!frame->parent())
2018 Send(new FrameHostMsg_DocumentOnLoadCompleted(routing_id_, 2018 Send(new FrameHostMsg_DocumentOnLoadCompleted(routing_id_));
2019 render_view_->page_id_));
2020 }
2021 } 2019 }
2022 2020
2023 void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame, 2021 void RenderFrameImpl::didFailLoad(blink::WebLocalFrame* frame,
2024 const blink::WebURLError& error) { 2022 const blink::WebURLError& error) {
2025 DCHECK(!frame_ || frame_ == frame); 2023 DCHECK(!frame_ || frame_ == frame);
2026 // TODO(nasko): Move implementation here. No state needed. 2024 // TODO(nasko): Move implementation here. No state needed.
2027 WebDataSource* ds = frame->dataSource(); 2025 WebDataSource* ds = frame->dataSource();
2028 DCHECK(ds); 2026 DCHECK(ds);
2029 2027
2030 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(), 2028 FOR_EACH_OBSERVER(RenderViewObserver, render_view_->observers(),
(...skipping 1361 matching lines...) Expand 10 before | Expand all | Expand 10 after
3392 weak_factory_.GetWeakPtr(), 3390 weak_factory_.GetWeakPtr(),
3393 render_view_->media_player_manager_, 3391 render_view_->media_player_manager_,
3394 stream_texture_factory, 3392 stream_texture_factory,
3395 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), 3393 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(),
3396 new RenderMediaLog()); 3394 new RenderMediaLog());
3397 } 3395 }
3398 3396
3399 #endif 3397 #endif
3400 3398
3401 } // namespace content 3399 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_observer.h ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698