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

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

Issue 1289053003: Modified RenderFrameObserver API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added render_frame_impl observation and name change Created 5 years, 4 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/renderer/render_frame_impl.h ('k') | no next file » | 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 3421 matching lines...) Expand 10 before | Expand all | Expand 10 after
3432 DCHECK(!frame_ || frame_ == frame); 3432 DCHECK(!frame_ || frame_ == frame);
3433 render_view_->Send(new ViewHostMsg_DidRunInsecureContent( 3433 render_view_->Send(new ViewHostMsg_DidRunInsecureContent(
3434 render_view_->GetRoutingID(), 3434 render_view_->GetRoutingID(),
3435 origin.toString().utf8(), 3435 origin.toString().utf8(),
3436 target)); 3436 target));
3437 GetContentClient()->renderer()->RecordRapporURL( 3437 GetContentClient()->renderer()->RecordRapporURL(
3438 "ContentSettings.MixedScript.RanMixedScript", 3438 "ContentSettings.MixedScript.RanMixedScript",
3439 GURL(origin.toString().utf8())); 3439 GURL(origin.toString().utf8()));
3440 } 3440 }
3441 3441
3442 void RenderFrameImpl::didChangePerformanceTiming() {
3443 FOR_EACH_OBSERVER(RenderFrameObserver,
3444 observers_,
3445 DidChangePerformanceTiming());
3446 }
3447
3442 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) { 3448 void RenderFrameImpl::didAbortLoading(blink::WebLocalFrame* frame) {
3443 DCHECK(!frame_ || frame_ == frame); 3449 DCHECK(!frame_ || frame_ == frame);
3444 #if defined(ENABLE_PLUGINS) 3450 #if defined(ENABLE_PLUGINS)
3445 if (frame != render_view_->webview()->mainFrame()) 3451 if (frame != render_view_->webview()->mainFrame())
3446 return; 3452 return;
3447 PluginChannelHost::Broadcast( 3453 PluginChannelHost::Broadcast(
3448 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID())); 3454 new PluginHostMsg_DidAbortLoading(render_view_->GetRoutingID()));
3449 #endif 3455 #endif
3450 } 3456 }
3451 3457
(...skipping 1621 matching lines...) Expand 10 before | Expand all | Expand 10 after
5073 void RenderFrameImpl::RegisterMojoServices() { 5079 void RenderFrameImpl::RegisterMojoServices() {
5074 // Only main frame have ImageDownloader service. 5080 // Only main frame have ImageDownloader service.
5075 if (!frame_->parent()) { 5081 if (!frame_->parent()) {
5076 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( 5082 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>(
5077 base::Bind(&ImageDownloaderImpl::CreateMojoService, 5083 base::Bind(&ImageDownloaderImpl::CreateMojoService,
5078 base::Unretained(this))); 5084 base::Unretained(this)));
5079 } 5085 }
5080 } 5086 }
5081 5087
5082 } // namespace content 5088 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698