| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ | 5 #ifndef COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ |
| 6 #define COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ | 6 #define COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "base/values.h" | 10 #include "base/values.h" |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 // Indicates that a user decision had been previously made but the | 37 // Indicates that a user decision had been previously made but the |
| 38 // decision has expired. | 38 // decision has expired. |
| 39 EXPIRED_BUT_PREVIOUSLY_ALLOWED = 1 << 3, | 39 EXPIRED_BUT_PREVIOUSLY_ALLOWED = 1 << 3, |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 SSLErrorUI(const GURL& request_url, | 42 SSLErrorUI(const GURL& request_url, |
| 43 int cert_error, | 43 int cert_error, |
| 44 const net::SSLInfo& ssl_info, | 44 const net::SSLInfo& ssl_info, |
| 45 int display_options, // Bitmask of SSLErrorOptionsMask values. | 45 int display_options, // Bitmask of SSLErrorOptionsMask values. |
| 46 const base::Time& time_triggered, | 46 const base::Time& time_triggered, |
| 47 const std::string& languages, | |
| 48 ControllerClient* controller); | 47 ControllerClient* controller); |
| 49 ~SSLErrorUI(); | 48 ~SSLErrorUI(); |
| 50 | 49 |
| 51 void PopulateStringsForHTML(base::DictionaryValue* load_time_data); | 50 void PopulateStringsForHTML(base::DictionaryValue* load_time_data); |
| 52 void HandleCommand(SecurityInterstitialCommands command); | 51 void HandleCommand(SecurityInterstitialCommands command); |
| 53 | 52 |
| 54 private: | 53 private: |
| 55 void PopulateOverridableStrings(base::DictionaryValue* load_time_data); | 54 void PopulateOverridableStrings(base::DictionaryValue* load_time_data); |
| 56 void PopulateNonOverridableStrings(base::DictionaryValue* load_time_data); | 55 void PopulateNonOverridableStrings(base::DictionaryValue* load_time_data); |
| 57 | 56 |
| 58 const GURL request_url_; | 57 const GURL request_url_; |
| 59 const int cert_error_; | 58 const int cert_error_; |
| 60 const net::SSLInfo ssl_info_; | 59 const net::SSLInfo ssl_info_; |
| 61 const base::Time time_triggered_; | 60 const base::Time time_triggered_; |
| 62 const std::string languages_; | |
| 63 | 61 |
| 64 // Set by the |display_options|. | 62 // Set by the |display_options|. |
| 65 const bool requested_strict_enforcement_; | 63 const bool requested_strict_enforcement_; |
| 66 const bool soft_override_enabled_; // UI provides a button to dismiss error. | 64 const bool soft_override_enabled_; // UI provides a button to dismiss error. |
| 67 const bool hard_override_enabled_; // Dismissing allowed, but no button. | 65 const bool hard_override_enabled_; // Dismissing allowed, but no button. |
| 68 | 66 |
| 69 ControllerClient* controller_; | 67 ControllerClient* controller_; |
| 70 bool user_made_decision_; // Whether the user made a choice in the UI. | 68 bool user_made_decision_; // Whether the user made a choice in the UI. |
| 71 | 69 |
| 72 DISALLOW_COPY_AND_ASSIGN(SSLErrorUI); | 70 DISALLOW_COPY_AND_ASSIGN(SSLErrorUI); |
| 73 }; | 71 }; |
| 74 | 72 |
| 75 } // security_interstitials | 73 } // security_interstitials |
| 76 | 74 |
| 77 #endif // COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ | 75 #endif // COMPONENTS_SECURITY_INTERSTITIALS_CORE_SSL_ERROR_UI_H_ |
| OLD | NEW |