Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Side by Side Diff: chrome/browser/permissions/permission_request_impl.cc

Issue 2816933002: Grouped requests
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_PROTECTED_MEDIA_IDENTIFIER: 65 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
66 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER; 66 return IDR_ANDROID_INFOBAR_PROTECTED_MEDIA_IDENTIFIER;
67 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
68 return IDR_INFOBAR_MEDIA_STREAM_MIC case CONTENT_SETTINGS_TYPE_MEDIASTREAM _CAMERA
69 : return IDR_INFOBAR_MEDIA_STREAM_CAMERA;
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 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
91 return ui::kMicrophoneIcon;
92 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
93 return ui::kVideocamIcon;
87 default: 94 default:
88 NOTREACHED(); 95 NOTREACHED();
89 return kExtensionIcon; 96 return kExtensionIcon;
90 } 97 }
91 #endif 98 #endif
92 } 99 }
93 100
94 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { 101 base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
95 int message_id; 102 int message_id;
96 switch (content_settings_type_) { 103 switch (content_settings_type_) {
97 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 104 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
98 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; 105 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
99 break; 106 break;
100 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 107 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
101 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 108 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
102 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; 109 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
103 break; 110 break;
104 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: 111 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
105 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT; 112 message_id = IDS_MIDI_SYSEX_PERMISSION_FRAGMENT;
106 break; 113 break;
107 #if defined(OS_CHROMEOS) 114 #if defined(OS_CHROMEOS)
108 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: 115 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
109 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT; 116 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_PERMISSION_FRAGMENT;
110 break; 117 break;
111 #endif 118 #endif
112 case CONTENT_SETTINGS_TYPE_PLUGINS: 119 case CONTENT_SETTINGS_TYPE_PLUGINS:
113 message_id = IDS_FLASH_PERMISSION_FRAGMENT; 120 message_id = IDS_FLASH_PERMISSION_FRAGMENT;
114 break; 121 break;
122 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
123 message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY_PERMISSION_FRAGMENT;
124 break;
125 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
126 message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY_PERMISSION_FRAGMENT;
127 break;
115 default: 128 default:
116 NOTREACHED(); 129 NOTREACHED();
117 return base::string16(); 130 return base::string16();
118 } 131 }
119 return l10n_util::GetStringUTF16(message_id); 132 return l10n_util::GetStringUTF16(message_id);
120 } 133 }
121 134
122 GURL PermissionRequestImpl::GetOrigin() const { 135 GURL PermissionRequestImpl::GetOrigin() const {
123 return request_origin_; 136 return request_origin_;
124 } 137 }
(...skipping 25 matching lines...) Expand all
150 163
151 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType() 164 PermissionRequestType PermissionRequestImpl::GetPermissionRequestType()
152 const { 165 const {
153 return PermissionUtil::GetRequestType(content_settings_type_); 166 return PermissionUtil::GetRequestType(content_settings_type_);
154 } 167 }
155 168
156 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() 169 PermissionRequestGestureType PermissionRequestImpl::GetGestureType()
157 const { 170 const {
158 return PermissionUtil::GetGestureType(has_gesture_); 171 return PermissionUtil::GetGestureType(has_gesture_);
159 } 172 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_request.h ('k') | chrome/browser/permissions/permission_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698