| 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 #include "chrome/browser/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 CONTENT_SETTINGS_TYPE_POPUPS, | 109 CONTENT_SETTINGS_TYPE_POPUPS, |
| 110 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, | 110 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, |
| 111 CONTENT_SETTINGS_TYPE_KEYGEN, | 111 CONTENT_SETTINGS_TYPE_KEYGEN, |
| 112 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, | 112 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, |
| 113 #if !defined(OS_ANDROID) | 113 #if !defined(OS_ANDROID) |
| 114 CONTENT_SETTINGS_TYPE_MOUSELOCK, | 114 CONTENT_SETTINGS_TYPE_MOUSELOCK, |
| 115 #endif | 115 #endif |
| 116 CONTENT_SETTINGS_TYPE_FULLSCREEN, | 116 CONTENT_SETTINGS_TYPE_FULLSCREEN, |
| 117 CONTENT_SETTINGS_TYPE_AUTOPLAY, | 117 CONTENT_SETTINGS_TYPE_AUTOPLAY, |
| 118 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, | 118 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, |
| 119 CONTENT_SETTINGS_TYPE_SENSORS, |
| 119 }; | 120 }; |
| 120 | 121 |
| 121 // Determines whether to show permission |type| in the Website Settings UI. Only | 122 // Determines whether to show permission |type| in the Website Settings UI. Only |
| 122 // applies to permissions listed in |kPermissionType|. | 123 // applies to permissions listed in |kPermissionType|. |
| 123 bool ShouldShowPermission(ContentSettingsType type) { | 124 bool ShouldShowPermission(ContentSettingsType type) { |
| 124 // TODO(mgiuca): When simplified-fullscreen-ui is enabled permanently on | 125 // TODO(mgiuca): When simplified-fullscreen-ui is enabled permanently on |
| 125 // Android, remove these from kPermissionType, rather than having this check | 126 // Android, remove these from kPermissionType, rather than having this check |
| 126 // (http://crbug.com/577396). | 127 // (http://crbug.com/577396). |
| 127 #if !defined(OS_ANDROID) | 128 #if !defined(OS_ANDROID) |
| 128 // Fullscreen and mouselock settings are no longer shown (always allow). | 129 // Fullscreen and mouselock settings are no longer shown (always allow). |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 838 info.connection_status = site_connection_status_; | 839 info.connection_status = site_connection_status_; |
| 839 info.connection_status_description = | 840 info.connection_status_description = |
| 840 UTF16ToUTF8(site_connection_details_); | 841 UTF16ToUTF8(site_connection_details_); |
| 841 info.identity_status = site_identity_status_; | 842 info.identity_status = site_identity_status_; |
| 842 info.identity_status_description = | 843 info.identity_status_description = |
| 843 UTF16ToUTF8(site_identity_details_); | 844 UTF16ToUTF8(site_identity_details_); |
| 844 info.certificate = certificate_; | 845 info.certificate = certificate_; |
| 845 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 846 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
| 846 ui_->SetIdentityInfo(info); | 847 ui_->SetIdentityInfo(info); |
| 847 } | 848 } |
| OLD | NEW |