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

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

Issue 336273002: Suggest upgrading to SP3 or later for invalid certificate errors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Get the version using OSInfo Created 6 years, 5 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 (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
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "chrome/browser/history/history_service.h" 14 #include "chrome/browser/history/history_service.h"
15 #include "content/public/browser/interstitial_page_delegate.h" 15 #include "content/public/browser/interstitial_page_delegate.h"
16 #include "net/ssl/ssl_info.h" 16 #include "net/ssl/ssl_info.h"
17 #include "ssl_error_info.h"
17 #include "url/gurl.h" 18 #include "url/gurl.h"
18 19
19 namespace base { 20 namespace base {
20 class DictionaryValue; 21 class DictionaryValue;
21 } 22 }
22 23
23 namespace content { 24 namespace content {
24 class InterstitialPage; 25 class InterstitialPage;
25 class WebContents; 26 class WebContents;
26 } 27 }
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // Used for getting num_visits_. 114 // Used for getting num_visits_.
114 CancelableRequestConsumer request_consumer_; 115 CancelableRequestConsumer request_consumer_;
115 // Is captive portal detection enabled? 116 // Is captive portal detection enabled?
116 bool captive_portal_detection_enabled_; 117 bool captive_portal_detection_enabled_;
117 // Did the probe complete before the interstitial was closed? 118 // Did the probe complete before the interstitial was closed?
118 bool captive_portal_probe_completed_; 119 bool captive_portal_probe_completed_;
119 // Did the captive portal probe receive an error or get a non-HTTP response? 120 // Did the captive portal probe receive an error or get a non-HTTP response?
120 bool captive_portal_no_response_; 121 bool captive_portal_no_response_;
121 // Was a captive portal detected? 122 // Was a captive portal detected?
122 bool captive_portal_detected_; 123 bool captive_portal_detected_;
124 // Used to find if the version of Windows XP is SP3 or lower.
125 static bool WindowsVersionSP3Lower();
123 126
124 // For the FieldTrial: this contains the name of the condition. 127 // For the FieldTrial: this contains the name of the condition.
125 std::string trial_condition_; 128 std::string trial_condition_;
126 129
127 content::NotificationRegistrar registrar_; 130 content::NotificationRegistrar registrar_;
128 131
132 FRIEND_TEST_ALL_PREFIXES(SSLBlockingPageTest,
133 SSLBlockingPageWindowsVersionTest);
134
129 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 135 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
130 }; 136 };
131 137
132 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 138 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698