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" |
11 #include "chrome/grit/generated_resources.h" | 11 #include "chrome/grit/generated_resources.h" |
| 12 #include "chrome/grit/theme_resources.h" |
12 #include "components/url_formatter/elide_url.h" | 13 #include "components/url_formatter/elide_url.h" |
13 #include "net/base/escape.h" | 14 #include "net/base/escape.h" |
14 #include "ui/base/l10n/l10n_util.h" | 15 #include "ui/base/l10n/l10n_util.h" |
15 | 16 |
16 #if defined(OS_ANDROID) | 17 #if defined(OS_ANDROID) |
17 #include "chrome/browser/android/android_theme_resources.h" | 18 #include "chrome/browser/android/android_theme_resources.h" |
18 #else | 19 #else |
19 #include "chrome/app/vector_icons/vector_icons.h" | 20 #include "chrome/app/vector_icons/vector_icons.h" |
20 #include "ui/vector_icons/vector_icons.h" | 21 #include "ui/vector_icons/vector_icons.h" |
21 #endif | 22 #endif |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 switch (content_settings_type_) { | 58 switch (content_settings_type_) { |
58 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 59 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
59 return IDR_ANDROID_INFOBAR_GEOLOCATION; | 60 return IDR_ANDROID_INFOBAR_GEOLOCATION; |
60 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 61 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
61 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 62 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
62 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; | 63 return IDR_ANDROID_INFOBAR_NOTIFICATIONS; |
63 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 64 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
64 return IDR_ANDROID_INFOBAR_MIDI; | 65 return IDR_ANDROID_INFOBAR_MIDI; |
65 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 66 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
66 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; | 67 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; |
| 68 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| 69 return IDR_INFOBAR_MEDIA_STREAM_MIC; |
| 70 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| 71 return IDR_INFOBAR_MEDIA_STREAM_CAMERA; |
67 default: | 72 default: |
68 NOTREACHED(); | 73 NOTREACHED(); |
69 return IDR_ANDROID_INFOBAR_WARNING; | 74 return IDR_ANDROID_INFOBAR_WARNING; |
70 } | 75 } |
71 #else | 76 #else |
72 switch (content_settings_type_) { | 77 switch (content_settings_type_) { |
73 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 78 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
74 return ui::kLocationOnIcon; | 79 return ui::kLocationOnIcon; |
75 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 80 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
76 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 81 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
77 return ui::kNotificationsIcon; | 82 return ui::kNotificationsIcon; |
78 #if defined(OS_CHROMEOS) | 83 #if defined(OS_CHROMEOS) |
79 // TODO(xhwang): fix this icon, see crrev.com/863263007 | 84 // TODO(xhwang): fix this icon, see crrev.com/863263007 |
80 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 85 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
81 return kProductIcon; | 86 return kProductIcon; |
82 #endif | 87 #endif |
83 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 88 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
84 return ui::kMidiIcon; | 89 return ui::kMidiIcon; |
85 case CONTENT_SETTINGS_TYPE_PLUGINS: | 90 case CONTENT_SETTINGS_TYPE_PLUGINS: |
86 return kExtensionIcon; | 91 return kExtensionIcon; |
| 92 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| 93 return ui::kMicrophoneIcon; |
| 94 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| 95 return ui::kVideocamIcon; |
87 default: | 96 default: |
88 NOTREACHED(); | 97 NOTREACHED(); |
89 return kExtensionIcon; | 98 return kExtensionIcon; |
90 } | 99 } |
91 #endif | 100 #endif |
92 } | 101 } |
93 | 102 |
94 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { | 103 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { |
95 int message_id; | 104 int message_id; |
96 switch (content_settings_type_) { | 105 switch (content_settings_type_) { |
97 case CONTENT_SETTINGS_TYPE_GEOLOCATION: | 106 case CONTENT_SETTINGS_TYPE_GEOLOCATION: |
98 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; | 107 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; |
99 break; | 108 break; |
100 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 109 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
101 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 110 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
102 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; | 111 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; |
103 break; | 112 break; |
104 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 113 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
105 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; | 114 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; |
106 break; | 115 break; |
107 #if defined(OS_CHROMEOS) | 116 #if defined(OS_CHROMEOS) |
108 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 117 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
109 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; | 118 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; |
110 break; | 119 break; |
111 #endif | 120 #endif |
112 case CONTENT_SETTINGS_TYPE_PLUGINS: | 121 case CONTENT_SETTINGS_TYPE_PLUGINS: |
113 message_id = IDS_FLASH_PERMISSION_FRAGMENT; | 122 message_id = IDS_FLASH_PERMISSION_FRAGMENT; |
114 break; | 123 break; |
| 124 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| 125 message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT; |
| 126 break; |
| 127 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| 128 message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT; |
| 129 break; |
115 default: | 130 default: |
116 NOTREACHED(); | 131 NOTREACHED(); |
117 return base::string16(); | 132 return base::string16(); |
118 } | 133 } |
119 return l10n_util::GetStringUTF16(message_id); | 134 return l10n_util::GetStringUTF16(message_id); |
120 } | 135 } |
121 | 136 |
122 GURL PermissionRequestImpl::GetOrigin() const { | 137 GURL PermissionRequestImpl::GetOrigin() const { |
123 return request_origin_; | 138 return request_origin_; |
124 } | 139 } |
(...skipping 25 matching lines...) Expand all Loading... |
150 | 165 |
151 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() | 166 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() |
152 const { | 167 const { |
153 return PermissionUtil::GetRequestType(content_settings_type_); | 168 return PermissionUtil::GetRequestType(content_settings_type_); |
154 } | 169 } |
155 | 170 |
156 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() | 171 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() |
157 const { | 172 const { |
158 return PermissionUtil::GetGestureType(has_gesture_); | 173 return PermissionUtil::GetGestureType(has_gesture_); |
159 } | 174 } |
OLD | NEW |