| OLD | NEW |
| 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_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ | 5 #ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ |
| 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ | 6 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/string16.h" | 9 #include "base/strings/string16.h" |
| 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" | 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 SITE_IDENTITY_STATUS_MALWARE, | 82 SITE_IDENTITY_STATUS_MALWARE, |
| 83 SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING, | 83 SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING, |
| 84 SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE, | 84 SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE, |
| 85 }; | 85 }; |
| 86 | 86 |
| 87 // UMA statistics for WebsiteSettings. Do not reorder or remove existing | 87 // UMA statistics for WebsiteSettings. Do not reorder or remove existing |
| 88 // fields. A Java counterpart will be generated for this enum. | 88 // fields. A Java counterpart will be generated for this enum. |
| 89 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.pageinfo | 89 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.pageinfo |
| 90 enum WebsiteSettingsAction { | 90 enum WebsiteSettingsAction { |
| 91 WEBSITE_SETTINGS_OPENED = 0, | 91 WEBSITE_SETTINGS_OPENED = 0, |
| 92 WEBSITE_SETTINGS_PERMISSIONS_TAB_SELECTED = 1, | 92 // No longer used; indicated actions for the old version of Page Info that |
| 93 WEBSITE_SETTINGS_CONNECTION_TAB_SELECTED = 2, | 93 // had a "Permissions" tab and a "Connection" tab. |
| 94 WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY = 3, | 94 // WEBSITE_SETTINGS_PERMISSIONS_TAB_SELECTED = 1, |
| 95 // WEBSITE_SETTINGS_CONNECTION_TAB_SELECTED = 2, |
| 96 // WEBSITE_SETTINGS_CONNECTION_TAB_SHOWN_IMMEDIATELY = 3, |
| 95 WEBSITE_SETTINGS_COOKIES_DIALOG_OPENED = 4, | 97 WEBSITE_SETTINGS_COOKIES_DIALOG_OPENED = 4, |
| 96 WEBSITE_SETTINGS_CHANGED_PERMISSION = 5, | 98 WEBSITE_SETTINGS_CHANGED_PERMISSION = 5, |
| 97 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6, | 99 WEBSITE_SETTINGS_CERTIFICATE_DIALOG_OPENED = 6, |
| 98 // No longer used; indicated a UI viewer for SCTs. | 100 // No longer used; indicated a UI viewer for SCTs. |
| 99 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7, | 101 // WEBSITE_SETTINGS_TRANSPARENCY_VIEWER_OPENED = 7, |
| 100 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8, | 102 WEBSITE_SETTINGS_CONNECTION_HELP_OPENED = 8, |
| 101 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9, | 103 WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9, |
| 102 WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10, | 104 WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED = 10, |
| 103 WEBSITE_SETTINGS_COUNT | 105 WEBSITE_SETTINGS_COUNT |
| 104 }; | 106 }; |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 bool did_revoke_user_ssl_decisions_; | 236 bool did_revoke_user_ssl_decisions_; |
| 235 | 237 |
| 236 Profile* profile_; | 238 Profile* profile_; |
| 237 | 239 |
| 238 security_state::SecurityLevel security_level_; | 240 security_state::SecurityLevel security_level_; |
| 239 | 241 |
| 240 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); | 242 DISALLOW_COPY_AND_ASSIGN(WebsiteSettings); |
| 241 }; | 243 }; |
| 242 | 244 |
| 243 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ | 245 #endif // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_ |
| OLD | NEW |