Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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_manager.h" | 5 #include "chrome/browser/permissions/permission_manager.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/memory/ptr_util.h" | 10 #include "base/memory/ptr_util.h" |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 #include "chrome/browser/background_sync/background_sync_permission_context.h" | 12 #include "chrome/browser/background_sync/background_sync_permission_context.h" |
| 13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 14 #include "chrome/browser/media/media_stream_device_permission_context.h" | 14 #include "chrome/browser/media/media_stream_device_permission_context.h" |
| 15 #include "chrome/browser/media/midi_permission_context.h" | 15 #include "chrome/browser/media/midi_permission_context.h" |
| 16 #include "chrome/browser/notifications/notification_permission_context.h" | 16 #include "chrome/browser/notifications/notification_permission_context.h" |
| 17 #include "chrome/browser/permissions/permission_context_base.h" | 17 #include "chrome/browser/permissions/permission_context_base.h" |
| 18 #include "chrome/browser/permissions/permission_manager_factory.h" | 18 #include "chrome/browser/permissions/permission_manager_factory.h" |
| 19 #include "chrome/browser/permissions/permission_request_id.h" | 19 #include "chrome/browser/permissions/permission_request_id.h" |
| 20 #include "chrome/browser/permissions/permission_uma_util.h" | |
| 20 #include "chrome/browser/profiles/profile.h" | 21 #include "chrome/browser/profiles/profile.h" |
| 21 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" | 22 #include "chrome/browser/push_messaging/push_messaging_permission_context.h" |
| 22 #include "chrome/browser/storage/durable_storage_permission_context.h" | 23 #include "chrome/browser/storage/durable_storage_permission_context.h" |
| 23 #include "chrome/browser/tab_contents/tab_util.h" | 24 #include "chrome/browser/tab_contents/tab_util.h" |
| 24 #include "chrome/common/features.h" | 25 #include "chrome/common/features.h" |
| 25 #include "components/content_settings/core/browser/host_content_settings_map.h" | 26 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 26 #include "content/public/browser/permission_type.h" | 27 #include "content/public/browser/permission_type.h" |
| 27 #include "content/public/browser/render_frame_host.h" | 28 #include "content/public/browser/render_frame_host.h" |
| 28 #include "content/public/browser/render_process_host.h" | 29 #include "content/public/browser/render_process_host.h" |
| 29 #include "content/public/browser/web_contents.h" | 30 #include "content/public/browser/web_contents.h" |
| (...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 286 render_frame_host, permissions, callback); | 287 render_frame_host, permissions, callback); |
| 287 int request_id = pending_requests_.Add(pending_request); | 288 int request_id = pending_requests_.Add(pending_request); |
| 288 | 289 |
| 289 const PermissionRequestID request(render_frame_host, request_id); | 290 const PermissionRequestID request(render_frame_host, request_id); |
| 290 | 291 |
| 291 for (size_t i = 0; i < permissions.size(); ++i) { | 292 for (size_t i = 0; i < permissions.size(); ++i) { |
| 292 const PermissionType permission = permissions[i]; | 293 const PermissionType permission = permissions[i]; |
| 293 | 294 |
| 294 if (IsConstantPermission(permission) || | 295 if (IsConstantPermission(permission) || |
| 295 !GetPermissionContext(permission)) { | 296 !GetPermissionContext(permission)) { |
| 297 if (IsConstantPermission(permission)) { | |
|
mlamouri (slow - plz ping)
2016/05/31 15:40:04
I think you could even remove the check. |GetPermi
Takashi Toyoshima
2016/06/01 05:11:52
Done.
| |
| 298 // Track permission request usages even for constant permissions. | |
| 299 PermissionUmaUtil::PermissionRequested(permission, requesting_origin, | |
| 300 embedding_origin, profile_); | |
| 301 } | |
| 296 OnPermissionsRequestResponseStatus(request_id, i, | 302 OnPermissionsRequestResponseStatus(request_id, i, |
| 297 GetPermissionStatus(permission, requesting_origin, embedding_origin)); | 303 GetPermissionStatus(permission, requesting_origin, embedding_origin)); |
| 298 continue; | 304 continue; |
| 299 } | 305 } |
| 300 | 306 |
| 301 PermissionContextBase* context = GetPermissionContext(permission); | 307 PermissionContextBase* context = GetPermissionContext(permission); |
| 302 context->RequestPermission( | 308 context->RequestPermission( |
| 303 web_contents, request, requesting_origin, | 309 web_contents, request, requesting_origin, |
| 304 base::Bind(&ContentSettingToPermissionStatusCallbackWrapper, | 310 base::Bind(&ContentSettingToPermissionStatusCallbackWrapper, |
| 305 base::Bind(&PermissionManager::OnPermissionsRequestResponseStatus, | 311 base::Bind(&PermissionManager::OnPermissionsRequestResponseStatus, |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 471 // Add the callback to |callbacks| which will be run after the loop to | 477 // Add the callback to |callbacks| which will be run after the loop to |
| 472 // prevent re-entrance issues. | 478 // prevent re-entrance issues. |
| 473 callbacks.push_back( | 479 callbacks.push_back( |
| 474 base::Bind(subscription->callback, | 480 base::Bind(subscription->callback, |
| 475 ContentSettingToPermissionStatus(new_value))); | 481 ContentSettingToPermissionStatus(new_value))); |
| 476 } | 482 } |
| 477 | 483 |
| 478 for (const auto& callback : callbacks) | 484 for (const auto& callback : callbacks) |
| 479 callback.Run(); | 485 callback.Run(); |
| 480 } | 486 } |
| OLD | NEW |