| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/permissions/permission_request_impl.h" | 5 #include "chrome/browser/permissions/permission_request_impl.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "chrome/browser/permissions/permission_uma_util.h" | 8 #include "chrome/browser/permissions/permission_uma_util.h" |
| 9 #include "chrome/browser/permissions/permission_util.h" | 9 #include "chrome/browser/permissions/permission_util.h" |
| 10 #include "chrome/grit/generated_resources.h" | 10 #include "chrome/grit/generated_resources.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 switch (permission_type_) { | 46 switch (permission_type_) { |
| 47 case content::PermissionType::GEOLOCATION: | 47 case content::PermissionType::GEOLOCATION: |
| 48 return IDR_ANDROID_INFOBAR_GEOLOCATION; | 48 return IDR_ANDROID_INFOBAR_GEOLOCATION; |
| 49 #if defined(ENABLE_NOTIFICATIONS) | 49 #if defined(ENABLE_NOTIFICATIONS) |
| 50 case content::PermissionType::NOTIFICATIONS: | 50 case content::PermissionType::NOTIFICATIONS: |
| 51 case content::PermissionType::PUSH_MESSAGING: | 51 case content::PermissionType::PUSH_MESSAGING: |
| 52 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; | 52 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; |
| 53 #endif | 53 #endif |
| 54 case content::PermissionType::MIDI_SYSEX: | 54 case content::PermissionType::MIDI_SYSEX: |
| 55 return IDR_ANDROID_INFOBAR_MIDI; | 55 return IDR_ANDROID_INFOBAR_MIDI; |
| 56 case content::PermissionType::SENSORS: |
| 57 return IDR_ANDROID_INFOBAR_MIDI; |
| 58 // TODO(riju):IDR_ANDROID_INFOBAR_SENSORS |
| 56 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 59 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 57 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; | 60 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
| 58 default: | 61 default: |
| 59 NOTREACHED(); | 62 NOTREACHED(); |
| 60 return IDR_ANDROID_INFOBAR_WARNING; | 63 return IDR_ANDROID_INFOBAR_WARNING; |
| 61 } | 64 } |
| 62 #else | 65 #else |
| 63 switch (permission_type_) { | 66 switch (permission_type_) { |
| 64 case content::PermissionType::GEOLOCATION: | 67 case content::PermissionType::GEOLOCATION: |
| 65 return gfx::VectorIconId::LOCATION_ON; | 68 return gfx::VectorIconId::LOCATION_ON; |
| 66 #if defined(ENABLE_NOTIFICATIONS) | 69 #if defined(ENABLE_NOTIFICATIONS) |
| 67 case content::PermissionType::NOTIFICATIONS: | 70 case content::PermissionType::NOTIFICATIONS: |
| 68 case content::PermissionType::PUSH_MESSAGING: | 71 case content::PermissionType::PUSH_MESSAGING: |
| 69 return gfx::VectorIconId::NOTIFICATIONS; | 72 return gfx::VectorIconId::NOTIFICATIONS; |
| 70 #endif | 73 #endif |
| 71 #if defined(OS_CHROMEOS) | 74 #if defined(OS_CHROMEOS) |
| 72 // TODO(xhwang): fix this icon, see crrev.com/863263007 | 75 // TODO(xhwang): fix this icon, see crrev.com/863263007 |
| 73 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 76 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 74 return gfx::VectorIconId::CHROME_PRODUCT; | 77 return gfx::VectorIconId::CHROME_PRODUCT; |
| 75 #endif | 78 #endif |
| 76 case content::PermissionType::MIDI_SYSEX: | 79 case content::PermissionType::MIDI_SYSEX: |
| 77 return gfx::VectorIconId::MIDI; | 80 return gfx::VectorIconId::MIDI; |
| 81 case content::PermissionType::SENSORS: |
| 82 return gfx::VectorIconId::MIDI; |
| 78 case content::PermissionType::FLASH: | 83 case content::PermissionType::FLASH: |
| 79 return gfx::VectorIconId::EXTENSION; | 84 return gfx::VectorIconId::EXTENSION; |
| 80 default: | 85 default: |
| 81 NOTREACHED(); | 86 NOTREACHED(); |
| 82 return gfx::VectorIconId::VECTOR_ICON_NONE; | 87 return gfx::VectorIconId::VECTOR_ICON_NONE; |
| 83 } | 88 } |
| 84 #endif | 89 #endif |
| 85 } | 90 } |
| 86 | 91 |
| 87 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { | 92 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { |
| (...skipping 12 matching lines...) Expand all Loading... |
| 100 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; | 105 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; |
| 101 break; | 106 break; |
| 102 #if defined(OS_CHROMEOS) | 107 #if defined(OS_CHROMEOS) |
| 103 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 108 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 104 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; | 109 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; |
| 105 break; | 110 break; |
| 106 #endif | 111 #endif |
| 107 case content::PermissionType::FLASH: | 112 case content::PermissionType::FLASH: |
| 108 message_id = IDS_FLASH_PERMISSION_FRAGMENT; | 113 message_id = IDS_FLASH_PERMISSION_FRAGMENT; |
| 109 break; | 114 break; |
| 115 case content::PermissionType::SENSORS: |
| 116 message_id = IDS_SENSORS_PERMISSION_FRAGMENT; |
| 117 break; |
| 110 default: | 118 default: |
| 111 NOTREACHED(); | 119 NOTREACHED(); |
| 112 return base::string16(); | 120 return base::string16(); |
| 113 } | 121 } |
| 114 return l10n_util::GetStringUTF16(message_id); | 122 return l10n_util::GetStringUTF16(message_id); |
| 115 } | 123 } |
| 116 | 124 |
| 117 GURL PermissionRequestImpl::GetOrigin() const { | 125 GURL PermissionRequestImpl::GetOrigin() const { |
| 118 return request_origin_; | 126 return request_origin_; |
| 119 } | 127 } |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 switch (permission_type_) { | 165 switch (permission_type_) { |
| 158 case content::PermissionType::GEOLOCATION: | 166 case content::PermissionType::GEOLOCATION: |
| 159 return CONTENT_SETTINGS_TYPE_GEOLOCATION; | 167 return CONTENT_SETTINGS_TYPE_GEOLOCATION; |
| 160 case content::PermissionType::PUSH_MESSAGING: | 168 case content::PermissionType::PUSH_MESSAGING: |
| 161 #if defined(ENABLE_NOTIFICATIONS) | 169 #if defined(ENABLE_NOTIFICATIONS) |
| 162 case content::PermissionType::NOTIFICATIONS: | 170 case content::PermissionType::NOTIFICATIONS: |
| 163 #endif | 171 #endif |
| 164 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; | 172 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; |
| 165 case content::PermissionType::MIDI_SYSEX: | 173 case content::PermissionType::MIDI_SYSEX: |
| 166 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; | 174 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; |
| 175 case content::PermissionType::SENSORS: |
| 176 return CONTENT_SETTINGS_TYPE_SENSORS; |
| 167 #if defined(OS_CHROMEOS) | 177 #if defined(OS_CHROMEOS) |
| 168 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 178 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
| 169 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; | 179 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; |
| 170 #endif | 180 #endif |
| 171 case content::PermissionType::FLASH: | 181 case content::PermissionType::FLASH: |
| 172 return CONTENT_SETTINGS_TYPE_PLUGINS; | 182 return CONTENT_SETTINGS_TYPE_PLUGINS; |
| 173 default: | 183 default: |
| 174 NOTREACHED(); | 184 NOTREACHED(); |
| 175 return CONTENT_SETTINGS_TYPE_DEFAULT; | 185 return CONTENT_SETTINGS_TYPE_DEFAULT; |
| 176 } | 186 } |
| 177 } | 187 } |
| OLD | NEW |