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

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: Changes 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"
felt 2014/06/30 18:36:15 do you need this in the .h file?
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 30 matching lines...) Expand all
57 const base::Callback<void(bool)>& callback); 58 const base::Callback<void(bool)>& callback);
58 virtual ~SSLBlockingPage(); 59 virtual ~SSLBlockingPage();
59 60
60 // A method that sets strings in the specified dictionary from the passed 61 // A method that sets strings in the specified dictionary from the passed
61 // vector so that they can be used to resource the ssl_roadblock.html/ 62 // vector so that they can be used to resource the ssl_roadblock.html/
62 // ssl_error.html files. 63 // ssl_error.html files.
63 // Note: there can be up to 5 strings in |extra_info|. 64 // Note: there can be up to 5 strings in |extra_info|.
64 static void SetExtraInfo(base::DictionaryValue* strings, 65 static void SetExtraInfo(base::DictionaryValue* strings,
65 const std::vector<base::string16>& extra_info); 66 const std::vector<base::string16>& extra_info);
66 67
68 // Used to find if the version of Windows XP is SP3 or lower.
69 static bool WindowsVersionSP3Lower();
felt 2014/06/30 18:16:07 This only needs to be invoked outside of the class
70
67 protected: 71 protected:
68 // InterstitialPageDelegate implementation. 72 // InterstitialPageDelegate implementation.
69 virtual std::string GetHTMLContents() OVERRIDE; 73 virtual std::string GetHTMLContents() OVERRIDE;
70 virtual void CommandReceived(const std::string& command) OVERRIDE; 74 virtual void CommandReceived(const std::string& command) OVERRIDE;
71 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE; 75 virtual void OverrideEntry(content::NavigationEntry* entry) OVERRIDE;
72 virtual void OverrideRendererPrefs( 76 virtual void OverrideRendererPrefs(
73 content::RendererPreferences* prefs) OVERRIDE; 77 content::RendererPreferences* prefs) OVERRIDE;
74 virtual void OnProceed() OVERRIDE; 78 virtual void OnProceed() OVERRIDE;
75 virtual void OnDontProceed() OVERRIDE; 79 virtual void OnDontProceed() OVERRIDE;
76 80
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 127
124 // For the FieldTrial: this contains the name of the condition. 128 // For the FieldTrial: this contains the name of the condition.
125 std::string trial_condition_; 129 std::string trial_condition_;
126 130
127 content::NotificationRegistrar registrar_; 131 content::NotificationRegistrar registrar_;
128 132
129 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage); 133 DISALLOW_COPY_AND_ASSIGN(SSLBlockingPage);
130 }; 134 };
131 135
132 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_ 136 #endif // CHROME_BROWSER_SSL_SSL_BLOCKING_PAGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698