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

Side by Side Diff: content/browser/web_contents/web_contents_impl.h

Issue 1506203004: Reland 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/browser/ssl/ssl_policy.cc ('k') | content/browser/web_contents/web_contents_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 (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 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
830 bool HasValidFrameSource(); 830 bool HasValidFrameSource();
831 831
832 // IPC message handlers. 832 // IPC message handlers.
833 void OnThemeColorChanged(SkColor theme_color); 833 void OnThemeColorChanged(SkColor theme_color);
834 void OnDidLoadResourceFromMemoryCache(const GURL& url, 834 void OnDidLoadResourceFromMemoryCache(const GURL& url,
835 const std::string& security_info, 835 const std::string& security_info,
836 const std::string& http_request, 836 const std::string& http_request,
837 const std::string& mime_type, 837 const std::string& mime_type,
838 ResourceType resource_type); 838 ResourceType resource_type);
839 void OnDidDisplayInsecureContent(); 839 void OnDidDisplayInsecureContent();
840 void OnDidRunInsecureContent(const std::string& security_origin, 840 void OnDidRunInsecureContent(const GURL& security_origin,
841 const GURL& target_url); 841 const GURL& target_url);
842 void OnDidDisplayContentWithCertificateErrors(
843 const GURL& url,
844 const std::string& security_info);
845 void OnDidRunContentWithCertificateErrors(const GURL& security_origin,
846 const GURL& url,
847 const std::string& security_info);
842 void OnDocumentLoadedInFrame(); 848 void OnDocumentLoadedInFrame();
843 void OnDidFinishLoad(const GURL& url); 849 void OnDidFinishLoad(const GURL& url);
844 void OnGoToEntryAtOffset(int offset); 850 void OnGoToEntryAtOffset(int offset);
845 void OnUpdateZoomLimits(int minimum_percent, 851 void OnUpdateZoomLimits(int minimum_percent,
846 int maximum_percent); 852 int maximum_percent);
847 void OnPageScaleFactorChanged(float page_scale_factor); 853 void OnPageScaleFactorChanged(float page_scale_factor);
848 void OnEnumerateDirectory(int request_id, const base::FilePath& path); 854 void OnEnumerateDirectory(int request_id, const base::FilePath& path);
849 855
850 void OnRegisterProtocolHandler(const std::string& protocol, 856 void OnRegisterProtocolHandler(const std::string& protocol,
851 const GURL& url, 857 const GURL& url,
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 // Adds/removes a callback called on creation of each new WebContents. 1315 // Adds/removes a callback called on creation of each new WebContents.
1310 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1316 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1311 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1317 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1312 1318
1313 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1319 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1314 }; 1320 };
1315 1321
1316 } // namespace content 1322 } // namespace content
1317 1323
1318 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1324 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/ssl/ssl_policy.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698