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

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

Issue 1360223002: Remove some redundant frame parameters from WebFrameClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 3435 matching lines...) Expand 10 before | Expand all | Expand 10 after
3446 if (url.SchemeIs(url::kDataScheme)) 3446 if (url.SchemeIs(url::kDataScheme))
3447 return; 3447 return;
3448 3448
3449 // Let the browser know we loaded a resource from the memory cache. This 3449 // Let the browser know we loaded a resource from the memory cache. This
3450 // message is needed to display the correct SSL indicators. 3450 // message is needed to display the correct SSL indicators.
3451 Send(new FrameHostMsg_DidLoadResourceFromMemoryCache( 3451 Send(new FrameHostMsg_DidLoadResourceFromMemoryCache(
3452 routing_id_, url, response.securityInfo(), request.httpMethod().utf8(), 3452 routing_id_, url, response.securityInfo(), request.httpMethod().utf8(),
3453 response.mimeType().utf8(), WebURLRequestToResourceType(request))); 3453 response.mimeType().utf8(), WebURLRequestToResourceType(request)));
3454 } 3454 }
3455 3455
3456 void RenderFrameImpl::didDisplayInsecureContent(blink::WebLocalFrame* frame) { 3456 void RenderFrameImpl::didDisplayInsecureContent() {
3457 DCHECK(!frame_ || frame_ == frame);
3458 Send(new FrameHostMsg_DidDisplayInsecureContent(routing_id_)); 3457 Send(new FrameHostMsg_DidDisplayInsecureContent(routing_id_));
3459 } 3458 }
3460 3459
3461 void RenderFrameImpl::didRunInsecureContent( 3460 void RenderFrameImpl::didRunInsecureContent(
3462 blink::WebLocalFrame* frame,
3463 const blink::WebSecurityOrigin& origin, 3461 const blink::WebSecurityOrigin& origin,
3464 const blink::WebURL& target) { 3462 const blink::WebURL& target) {
3465 DCHECK(!frame_ || frame_ == frame);
3466 Send(new FrameHostMsg_DidRunInsecureContent( 3463 Send(new FrameHostMsg_DidRunInsecureContent(
3467 routing_id_, origin.toString().utf8(), target)); 3464 routing_id_, origin.toString().utf8(), target));
3468 GetContentClient()->renderer()->RecordRapporURL( 3465 GetContentClient()->renderer()->RecordRapporURL(
3469 "ContentSettings.MixedScript.RanMixedScript", 3466 "ContentSettings.MixedScript.RanMixedScript",
3470 GURL(origin.toString().utf8())); 3467 GURL(origin.toString().utf8()));
3471 } 3468 }
3472 3469
3473 void RenderFrameImpl::didChangePerformanceTiming() { 3470 void RenderFrameImpl::didChangePerformanceTiming() {
3474 FOR_EACH_OBSERVER(RenderFrameObserver, 3471 FOR_EACH_OBSERVER(RenderFrameObserver,
3475 observers_, 3472 observers_,
(...skipping 1629 matching lines...) Expand 10 before | Expand all | Expand 10 after
5105 mojo::ServiceProviderPtr service_provider; 5102 mojo::ServiceProviderPtr service_provider;
5106 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5103 mojo::URLRequestPtr request(mojo::URLRequest::New());
5107 request->url = mojo::String::From(url); 5104 request->url = mojo::String::From(url);
5108 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5105 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5109 nullptr, nullptr, 5106 nullptr, nullptr,
5110 base::Bind(&OnGotContentHandlerID)); 5107 base::Bind(&OnGotContentHandlerID));
5111 return service_provider.Pass(); 5108 return service_provider.Pass();
5112 } 5109 }
5113 5110
5114 } // namespace content 5111 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698