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 27 matching lines...) Expand all Loading... |
147 const { | 155 const { |
148 switch (permission_type_) { | 156 switch (permission_type_) { |
149 case content::PermissionType::GEOLOCATION: | 157 case content::PermissionType::GEOLOCATION: |
150 return PermissionRequestType::PERMISSION_GEOLOCATION; | 158 return PermissionRequestType::PERMISSION_GEOLOCATION; |
151 #if defined(ENABLE_NOTIFICATIONS) | 159 #if defined(ENABLE_NOTIFICATIONS) |
152 case content::PermissionType::NOTIFICATIONS: | 160 case content::PermissionType::NOTIFICATIONS: |
153 return PermissionRequestType::PERMISSION_NOTIFICATIONS; | 161 return PermissionRequestType::PERMISSION_NOTIFICATIONS; |
154 #endif | 162 #endif |
155 case content::PermissionType::MIDI_SYSEX: | 163 case content::PermissionType::MIDI_SYSEX: |
156 return PermissionRequestType::PERMISSION_MIDI_SYSEX; | 164 return PermissionRequestType::PERMISSION_MIDI_SYSEX; |
| 165 case content::PermissionType::SENSORS: |
| 166 return PermissionRequestType::PERMISSION_SENSORS; |
157 case content::PermissionType::PUSH_MESSAGING: | 167 case content::PermissionType::PUSH_MESSAGING: |
158 return PermissionRequestType::PERMISSION_PUSH_MESSAGING; | 168 return PermissionRequestType::PERMISSION_PUSH_MESSAGING; |
159 #if defined(OS_CHROMEOS) | 169 #if defined(OS_CHROMEOS) |
160 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 170 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
161 return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; | 171 return PermissionRequestType::PERMISSION_PROTECTED_MEDIA_IDENTIFIER; |
162 #endif | 172 #endif |
163 case content::PermissionType::FLASH: | 173 case content::PermissionType::FLASH: |
164 return PermissionRequestType::PERMISSION_FLASH; | 174 return PermissionRequestType::PERMISSION_FLASH; |
165 default: | 175 default: |
166 NOTREACHED(); | 176 NOTREACHED(); |
(...skipping 11 matching lines...) Expand all Loading... |
178 switch (permission_type_) { | 188 switch (permission_type_) { |
179 case content::PermissionType::GEOLOCATION: | 189 case content::PermissionType::GEOLOCATION: |
180 return CONTENT_SETTINGS_TYPE_GEOLOCATION; | 190 return CONTENT_SETTINGS_TYPE_GEOLOCATION; |
181 case content::PermissionType::PUSH_MESSAGING: | 191 case content::PermissionType::PUSH_MESSAGING: |
182 #if defined(ENABLE_NOTIFICATIONS) | 192 #if defined(ENABLE_NOTIFICATIONS) |
183 case content::PermissionType::NOTIFICATIONS: | 193 case content::PermissionType::NOTIFICATIONS: |
184 #endif | 194 #endif |
185 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; | 195 return CONTENT_SETTINGS_TYPE_NOTIFICATIONS; |
186 case content::PermissionType::MIDI_SYSEX: | 196 case content::PermissionType::MIDI_SYSEX: |
187 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; | 197 return CONTENT_SETTINGS_TYPE_MIDI_SYSEX; |
| 198 case content::PermissionType::SENSORS: |
| 199 return CONTENT_SETTINGS_TYPE_SENSORS; |
188 #if defined(OS_CHROMEOS) | 200 #if defined(OS_CHROMEOS) |
189 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: | 201 case content::PermissionType::PROTECTED_MEDIA_IDENTIFIER: |
190 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; | 202 return CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER; |
191 #endif | 203 #endif |
192 case content::PermissionType::FLASH: | 204 case content::PermissionType::FLASH: |
193 return CONTENT_SETTINGS_TYPE_PLUGINS; | 205 return CONTENT_SETTINGS_TYPE_PLUGINS; |
194 default: | 206 default: |
195 NOTREACHED(); | 207 NOTREACHED(); |
196 return CONTENT_SETTINGS_TYPE_DEFAULT; | 208 return CONTENT_SETTINGS_TYPE_DEFAULT; |
197 } | 209 } |
198 } | 210 } |
OLD | NEW |