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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.h

Issue 294343004: New SSL interstitial (behind Finch flag) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed spurious OVERRIDE Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/ssl/overridable_v2.js ('k') | chrome/browser/ssl/ssl_blocking_page.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 CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 5 #ifndef CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 6 #define CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE; 59 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE;
60 virtual void OverrideRendererPrefs( 60 virtual void OverrideRendererPrefs(
61 content::RendererPreferences* prefs) OVERRIDE; 61 content::RendererPreferences* prefs) OVERRIDE;
62 virtual void OnProceed() OVERRIDE; 62 virtual void OnProceed() OVERRIDE;
63 virtual void OnDontProceed() OVERRIDE; 63 virtual void OnDontProceed() OVERRIDE;
64 64
65 private: 65 private:
66 void NotifyDenyCertificate(); 66 void NotifyDenyCertificate();
67 void NotifyAllowCertificate(); 67 void NotifyAllowCertificate();
68 68
69 // Implements the new interstitial.
70 std::string GetHTMLContentsV2();
71
69 // Used to query the HistoryService to see if the URL is in history. For UMA. 72 // Used to query the HistoryService to see if the URL is in history. For UMA.
70 void OnGotHistoryCount(HistoryService::Handle handle, 73 void OnGotHistoryCount(HistoryService::Handle handle,
71 bool success, 74 bool success,
72 int num_visits, 75 int num_visits,
73 base::Time first_visit); 76 base::Time first_visit);
74 77
75 // content::NotificationObserver: 78 // content::NotificationObserver:
76 virtual void Observe( 79 virtual void Observe(
77 int type, 80 int type,
78 const content::NotificationSource& source, 81 const content::NotificationSource& source,
(...skipping 27 matching lines...) Expand all
106 109
107 // For the FieldTrial: this contains the name of the condition. 110 // For the FieldTrial: this contains the name of the condition.
108 std::string trialCondition_; 111 std::string trialCondition_;
109 112
110 content::NotificationRegistrar registrar_; 113 content::NotificationRegistrar registrar_;
111 114
112 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 115 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
113 }; 116 };
114 117
115 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 118 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW
« no previous file with comments | « chrome/browser/resources/ssl/overridable_v2.js ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698