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

Side by Side Diff: content/browser/web_contents/web_contents_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/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 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 bool HasValidFrameSource(); 834 bool HasValidFrameSource();
835 835
836 // IPC message handlers. 836 // IPC message handlers.
837 void OnThemeColorChanged(SkColor theme_color); 837 void OnThemeColorChanged(SkColor theme_color);
838 void OnDidLoadResourceFromMemoryCache(const GURL& url, 838 void OnDidLoadResourceFromMemoryCache(const GURL& url,
839 const std::string& security_info, 839 const std::string& security_info,
840 const std::string& http_request, 840 const std::string& http_request,
841 const std::string& mime_type, 841 const std::string& mime_type,
842 ResourceType resource_type); 842 ResourceType resource_type);
843 void OnDidDisplayInsecureContent(); 843 void OnDidDisplayInsecureContent();
844 void OnDidRunInsecureContent(const GURL& security_origin, 844 void OnDidRunInsecureContent(const std::string& security_origin,
845 const GURL& target_url); 845 const GURL& target_url);
846 void OnDidDisplayContentWithCertificateErrors(
847 const GURL& url,
848 const std::string& security_info);
849 void OnDidRunContentWithCertificateErrors(const GURL& security_origin,
850 const GURL& url,
851 const std::string& security_info);
852 void OnDocumentLoadedInFrame(); 846 void OnDocumentLoadedInFrame();
853 void OnDidFinishLoad(const GURL& url); 847 void OnDidFinishLoad(const GURL& url);
854 void OnGoToEntryAtOffset(int offset); 848 void OnGoToEntryAtOffset(int offset);
855 void OnUpdateZoomLimits(int minimum_percent, 849 void OnUpdateZoomLimits(int minimum_percent,
856 int maximum_percent); 850 int maximum_percent);
857 void OnPageScaleFactorChanged(float page_scale_factor); 851 void OnPageScaleFactorChanged(float page_scale_factor);
858 void OnEnumerateDirectory(int request_id, const base::FilePath& path); 852 void OnEnumerateDirectory(int request_id, const base::FilePath& path);
859 853
860 void OnRegisterProtocolHandler(const std::string& protocol, 854 void OnRegisterProtocolHandler(const std::string& protocol,
861 const GURL& url, 855 const GURL& url,
(...skipping 495 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 // Adds/removes a callback called on creation of each new WebContents. 1351 // Adds/removes a callback called on creation of each new WebContents.
1358 static void AddCreatedCallbackForTesting(const CreatedCallback& callback); 1352 static void AddCreatedCallbackForTesting(const CreatedCallback& callback);
1359 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback); 1353 static void RemoveCreatedCallbackForTesting(const CreatedCallback& callback);
1360 1354
1361 DISALLOW_COPY_AND_ASSIGN(FriendZone); 1355 DISALLOW_COPY_AND_ASSIGN(FriendZone);
1362 }; 1356 };
1363 1357
1364 } // namespace content 1358 } // namespace content
1365 1359
1366 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ 1360 #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