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

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

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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/common/resource_response_info.cc ('k') | content/renderer/render_frame_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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 void didReceiveResponse(blink::WebLocalFrame* frame, 515 void didReceiveResponse(blink::WebLocalFrame* frame,
516 unsigned identifier, 516 unsigned identifier,
517 const blink::WebURLResponse& response) override; 517 const blink::WebURLResponse& response) override;
518 void didLoadResourceFromMemoryCache( 518 void didLoadResourceFromMemoryCache(
519 blink::WebLocalFrame* frame, 519 blink::WebLocalFrame* frame,
520 const blink::WebURLRequest& request, 520 const blink::WebURLRequest& request,
521 const blink::WebURLResponse& response) override; 521 const blink::WebURLResponse& response) override;
522 void didDisplayInsecureContent() override; 522 void didDisplayInsecureContent() override;
523 void didRunInsecureContent(const blink::WebSecurityOrigin& origin, 523 void didRunInsecureContent(const blink::WebSecurityOrigin& origin,
524 const blink::WebURL& target) override; 524 const blink::WebURL& target) override;
525 void didDisplayContentWithCertificateErrors(
526 const blink::WebURL& url,
527 const blink::WebCString& security_info,
528 const blink::WebURL& main_resource_url,
529 const blink::WebCString& main_resource_security_info) override;
530 void didRunContentWithCertificateErrors(
531 const blink::WebURL& url,
532 const blink::WebCString& security_info,
533 const blink::WebURL& main_resource_url,
534 const blink::WebCString& main_resource_security_info) override;
535 void didChangePerformanceTiming() override; 525 void didChangePerformanceTiming() override;
536 void didCreateScriptContext(blink::WebLocalFrame* frame, 526 void didCreateScriptContext(blink::WebLocalFrame* frame,
537 v8::Local<v8::Context> context, 527 v8::Local<v8::Context> context,
538 int extension_group, 528 int extension_group,
539 int world_id) override; 529 int world_id) override;
540 void willReleaseScriptContext(blink::WebLocalFrame* frame, 530 void willReleaseScriptContext(blink::WebLocalFrame* frame,
541 v8::Local<v8::Context> context, 531 v8::Local<v8::Context> context,
542 int world_id) override; 532 int world_id) override;
543 void didChangeScrollOffset(blink::WebLocalFrame* frame) override; 533 void didChangeScrollOffset(blink::WebLocalFrame* frame) override;
544 void willInsertBody(blink::WebLocalFrame* frame) override; 534 void willInsertBody(blink::WebLocalFrame* frame) override;
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 #endif 1117 #endif
1128 1118
1129 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1119 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1130 1120
1131 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1121 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1132 }; 1122 };
1133 1123
1134 } // namespace content 1124 } // namespace content
1135 1125
1136 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1126 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/public/common/resource_response_info.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698