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

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

Issue 2897223002: Fix message text for modal prompts when PermissionRequestManager enabled (Closed)
Patch Set: address comments Created 3 years, 6 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 return ui::kMicrophoneIcon; 93 return ui::kMicrophoneIcon;
94 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 94 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
95 return ui::kVideocamIcon; 95 return ui::kVideocamIcon;
96 default: 96 default:
97 NOTREACHED(); 97 NOTREACHED();
98 return kExtensionIcon; 98 return kExtensionIcon;
99 } 99 }
100 #endif 100 #endif
101 } 101 }
102 102
103 #if defined(OS_ANDROID)
104 base::string16 PermissionRequestImpl::GetMessageText() const {
105 // This is currently only used for modal dialogs on Android.
106 int message_id;
107 switch (content_settings_type_) {
108 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
109 message_id = IDS_GEOLOCATION_INFOBAR_QUESTION;
110 break;
111 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
112 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
113 message_id = IDS_NOTIFICATION_PERMISSIONS;
114 break;
115 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX:
116 message_id = IDS_MIDI_SYSEX_INFOBAR_QUESTION;
117 break;
118 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER:
119 message_id = IDS_PROTECTED_MEDIA_IDENTIFIER_INFOBAR_QUESTION;
120 break;
121 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
122 message_id = IDS_MEDIA_CAPTURE_AUDIO_ONLY;
123 break;
124 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
125 message_id = IDS_MEDIA_CAPTURE_VIDEO_ONLY;
126 break;
127 default:
128 NOTREACHED();
129 return base::string16();
130 }
131 return l10n_util::GetStringFUTF16(
132 message_id,
133 url_formatter::FormatUrlForSecurityDisplay(
134 GetOrigin(), url_formatter::SchemeDisplay::OMIT_CRYPTOGRAPHIC));
135 }
136 #endif
137
103 base::string16 PermissionRequestImpl::GetMessageTextFragment() const { 138 base::string16 PermissionRequestImpl::GetMessageTextFragment() const {
104 int message_id; 139 int message_id;
105 switch (content_settings_type_) { 140 switch (content_settings_type_) {
106 case CONTENT_SETTINGS_TYPE_GEOLOCATION: 141 case CONTENT_SETTINGS_TYPE_GEOLOCATION:
107 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT; 142 message_id = IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT;
108 break; 143 break;
109 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: 144 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:
110 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: 145 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING:
111 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT; 146 message_id = IDS_NOTIFICATION_PERMISSIONS_FRAGMENT;
112 break; 147 break;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 } 204 }
170 205
171 PermissionRequestGestureType PermissionRequestImpl::GetGestureType() 206 PermissionRequestGestureType PermissionRequestImpl::GetGestureType()
172 const { 207 const {
173 return PermissionUtil::GetGestureType(has_gesture_); 208 return PermissionUtil::GetGestureType(has_gesture_);
174 } 209 }
175 210
176 ContentSettingsType PermissionRequestImpl::GetContentSettingsType() const { 211 ContentSettingsType PermissionRequestImpl::GetContentSettingsType() const {
177 return content_settings_type_; 212 return content_settings_type_;
178 } 213 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/permission_request_impl.h ('k') | chrome/browser/permissions/permission_request_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698