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_decision_auto_blocker.h" | 8 #include "chrome/browser/permissions/permission_decision_auto_blocker.h" |
9 #include "chrome/browser/permissions/permission_uma_util.h" | 9 #include "chrome/browser/permissions/permission_uma_util.h" |
10 #include "chrome/browser/permissions/permission_util.h" | 10 #include "chrome/browser/permissions/permission_util.h" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { | 55 PermissionRequest::IconId PermissionRequestImpl::GetIconId() const { |
56 #if defined(OS_ANDROID) | 56 #if defined(OS_ANDROID) |
57 switch (content_settings_type_) { | 57 switch (content_settings_type_) { |
58 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 58 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
59 return IDR_ANDROID_INFOBAR_GEOLOCATION; | 59 return IDR_ANDROID_INFOBAR_GEOLOCATION; |
60 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 60 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
61 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 61 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
62 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; | 62 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; |
63 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 63 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
64 return IDR_ANDROID_INFOBAR_MIDI; | 64 return IDR_ANDROID_INFOBAR_MIDI; |
| 65 case CONTENT_SETTINGS_TYPE_SENSORS: |
| 66 return IDR_ANDROID_INFOBAR_MIDI; |
| 67 // TODO(riju):IDR_ANDROID_INFOBAR_SENSORS |
65 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 68 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
66 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; | 69 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
67 default: | 70 default: |
68 NOTREACHED(); | 71 NOTREACHED(); |
69 return IDR_ANDROID_INFOBAR_WARNING; | 72 return IDR_ANDROID_INFOBAR_WARNING; |
70 } | 73 } |
71 #else | 74 #else |
72 switch (content_settings_type_) { | 75 switch (content_settings_type_) { |
73 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 76 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
74 return ui::kLocationOnIcon; | 77 return ui::kLocationOnIcon; |
75 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 78 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
76 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 79 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
77 return ui::kNotificationsIcon; | 80 return ui::kNotificationsIcon; |
78 #if defined(OS_CHROMEOS) | 81 #if defined(OS_CHROMEOS) |
79 // TODO(xhwang): fix this icon, see crrev.com/863263007 | 82 // TODO(xhwang): fix this icon, see crrev.com/863263007 |
80 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 83 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
81 return kProductIcon; | 84 return kProductIcon; |
82 #endif | 85 #endif |
83 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 86 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
84 return ui::kMidiIcon; | 87 return ui::kMidiIcon; |
85 case CONTENT_SETTINGS_TYPE_PLUGINS: | 88 case CONTENT_SETTINGS_TYPE_PLUGINS: |
86 return kExtensionIcon; | 89 return kExtensionIcon; |
| 90 // TODO(riju): Use correct icons when ready. |
| 91 case CONTENT_SETTINGS_TYPE_SENSORS: |
| 92 return ui::kMidiIcon; |
87 default: | 93 default: |
88 NOTREACHED(); | 94 NOTREACHED(); |
89 return kExtensionIcon; | 95 return kExtensionIcon; |
90 } | 96 } |
91 #endif | 97 #endif |
92 } | 98 } |
93 | 99 |
94 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { | 100 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { |
95 int message_id; | 101 int message_id; |
96 switch (content_settings_type_) { | 102 switch (content_settings_type_) { |
97 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 103 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
98 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; | 104 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; |
99 break; | 105 break; |
100 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 106 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
101 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 107 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
102 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; | 108 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; |
103 break; | 109 break; |
104 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 110 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
105 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; | 111 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; |
106 break; | 112 break; |
107 #if defined(OS_CHROMEOS) | 113 #if defined(OS_CHROMEOS) |
108 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 114 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
109 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; | 115 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; |
110 break; | 116 break; |
111 #endif | 117 #endif |
112 case CONTENT_SETTINGS_TYPE_PLUGINS: | 118 case CONTENT_SETTINGS_TYPE_PLUGINS: |
113 message_id = IDS_FLASH_PERMISSION_FRAGMENT; | 119 message_id = IDS_FLASH_PERMISSION_FRAGMENT; |
114 break; | 120 break; |
| 121 case CONTENT_SETTINGS_TYPE_SENSORS: |
| 122 message_id = IDS_SENSORS_PERMISSION_FRAGMENT; |
| 123 break; |
115 default: | 124 default: |
116 NOTREACHED(); | 125 NOTREACHED(); |
117 return base::string16(); | 126 return base::string16(); |
118 } | 127 } |
119 return l10n_util::GetStringUTF16(message_id); | 128 return l10n_util::GetStringUTF16(message_id); |
120 } | 129 } |
121 | 130 |
122 GURL PermissionRequestImpl::GetOrigin() const { | 131 GURL PermissionRequestImpl::GetOrigin() const { |
123 return request_origin_; | 132 return request_origin_; |
124 } | 133 } |
(...skipping 25 matching lines...) Expand all Loading... |
150 | 159 |
151 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() | 160 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() |
152 const { | 161 const { |
153 return PermissionUtil::GetRequestType(content_settings_type_); | 162 return PermissionUtil::GetRequestType(content_settings_type_); |
154 } | 163 } |
155 | 164 |
156 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() | 165 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() |
157 const { | 166 const { |
158 return PermissionUtil::GetGestureType(has_gesture_); | 167 return PermissionUtil::GetGestureType(has_gesture_); |
159 } | 168 } |
OLD | NEW |