Chromium Code Reviews| 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_context_uma_util.h" | 5 #include "chrome/browser/permissions/permission_context_uma_util.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
| 8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/permissions/permission_manager.h" | 10 #include "chrome/browser/permissions/permission_manager.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 64 action_str = "Dismissed"; | 64 action_str = "Dismissed"; |
| 65 break; | 65 break; |
| 66 case IGNORED: | 66 case IGNORED: |
| 67 action_str = "Ignored"; | 67 action_str = "Ignored"; |
| 68 break; | 68 break; |
| 69 default: | 69 default: |
| 70 NOTREACHED(); | 70 NOTREACHED(); |
| 71 break; | 71 break; |
| 72 } | 72 } |
| 73 | 73 |
| 74 if (permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA || | |
|
mlamouri (slow - plz ping)
2015/10/19 10:42:19
Could you explain?
tsergeant
2015/10/20 06:38:43
Added a comment.
| |
| 75 permission == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC) | |
| 76 return ""; | |
| 77 | |
| 74 std::string permission_str = | 78 std::string permission_str = |
| 75 PermissionContextUmaUtil::GetPermissionString(permission); | 79 PermissionContextUmaUtil::GetPermissionString(permission); |
| 76 if (permission_str.empty()) | 80 if (permission_str.empty()) |
| 77 return ""; | 81 return ""; |
| 78 return base::StringPrintf("ContentSettings.PermissionActions_%s.%s.Url", | 82 return base::StringPrintf("ContentSettings.PermissionActions_%s.%s.Url", |
| 79 permission_str.c_str(), action_str.c_str()); | 83 permission_str.c_str(), action_str.c_str()); |
| 80 } | 84 } |
| 81 | 85 |
| 82 void RecordPermissionAction(ContentSettingsType permission, | 86 void RecordPermissionAction(ContentSettingsType permission, |
| 83 PermissionAction action, | 87 PermissionAction action, |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 94 action); | 98 action); |
| 95 break; | 99 break; |
| 96 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: | 100 case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: |
| 97 PERMISSION_ACTION_UMA( | 101 PERMISSION_ACTION_UMA( |
| 98 secure_origin, | 102 secure_origin, |
| 99 "ContentSettings.PermissionActions_Notifications", | 103 "ContentSettings.PermissionActions_Notifications", |
| 100 "ContentSettings.PermissionActionsSecureOrigin_Notifications", | 104 "ContentSettings.PermissionActionsSecureOrigin_Notifications", |
| 101 "ContentSettings.PermissionActionsInsecureOrigin_Notifications", | 105 "ContentSettings.PermissionActionsInsecureOrigin_Notifications", |
| 102 action); | 106 action); |
| 103 break; | 107 break; |
| 108 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: | |
| 109 PERMISSION_ACTION_UMA( | |
| 110 secure_origin, | |
| 111 "ContentSettings.PermissionActions_MediaStreamCamera", | |
| 112 "ContentSettings.PermissionActionsSecureOrigin_MediaStreamCamera", | |
| 113 "ContentSettings.PermissionActionsInsecureOrigin_MediaStreamCamera", | |
|
mlamouri (slow - plz ping)
2015/10/19 10:42:19
Could you name these Permissions.Actions.VideoCapt
tsergeant
2015/10/20 06:38:43
Sure, sounds good. I can follow-up next week.
I'v
mlamouri (slow - plz ping)
2015/10/20 11:00:40
Would it make sense to rename the current Permissi
tsergeant
2015/10/21 02:44:49
Done.
| |
| 114 action); | |
| 115 break; | |
| 116 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: | |
| 117 PERMISSION_ACTION_UMA( | |
| 118 secure_origin, | |
| 119 "ContentSettings.PermissionActions_MediaStreamMic", | |
| 120 "ContentSettings.PermissionActionsSecureOrigin_MediaStreamMic", | |
| 121 "ContentSettings.PermissionActionsInsecureOrigin_MediaStreamMic", | |
|
mlamouri (slow - plz ping)
2015/10/19 10:42:19
Permissions.Actions.AudioCapture?
| |
| 122 action); | |
| 123 break; | |
| 104 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: | 124 case CONTENT_SETTINGS_TYPE_MIDI_SYSEX: |
| 105 PERMISSION_ACTION_UMA( | 125 PERMISSION_ACTION_UMA( |
| 106 secure_origin, | 126 secure_origin, |
| 107 "ContentSettings.PermissionActions_MidiSysEx", | 127 "ContentSettings.PermissionActions_MidiSysEx", |
| 108 "ContentSettings.PermissionActionsSecureOrigin_MidiSysEx", | 128 "ContentSettings.PermissionActionsSecureOrigin_MidiSysEx", |
| 109 "ContentSettings.PermissionActionsInsecureOrigin_MidiSysEx", | 129 "ContentSettings.PermissionActionsInsecureOrigin_MidiSysEx", |
| 110 action); | 130 action); |
| 111 break; | 131 break; |
| 112 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 132 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
| 113 PERMISSION_ACTION_UMA( | 133 PERMISSION_ACTION_UMA( |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 321 return "MidiSysEx"; | 341 return "MidiSysEx"; |
| 322 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: | 342 case CONTENT_SETTINGS_TYPE_PUSH_MESSAGING: |
| 323 return "PushMessaging"; | 343 return "PushMessaging"; |
| 324 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: | 344 case CONTENT_SETTINGS_TYPE_DURABLE_STORAGE: |
| 325 return "DurableStorage"; | 345 return "DurableStorage"; |
| 326 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) | 346 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) |
| 327 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: | 347 case CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER: |
| 328 return "ProtectedMediaIdentifier"; | 348 return "ProtectedMediaIdentifier"; |
| 329 #endif | 349 #endif |
| 330 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: | 350 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: |
| 331 return "MediaStreamMic"; | 351 return "MediaStreamMic"; |
|
mlamouri (slow - plz ping)
2015/10/19 10:42:19
Please, rename to AudioCapture. There is a CL in p
| |
| 332 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: | 352 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: |
| 333 return "MediaStreamCamera"; | 353 return "MediaStreamCamera"; |
|
mlamouri (slow - plz ping)
2015/10/19 10:42:19
ditto with VideoCapture.
| |
| 334 default: | 354 default: |
| 335 NOTREACHED(); | 355 NOTREACHED(); |
| 336 return ""; | 356 return ""; |
| 337 } | 357 } |
| 338 } | 358 } |
| OLD | NEW |