| 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 "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" | 11 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" |
| 12 #include "chrome/browser/permissions/permission_context.h" | 12 #include "chrome/browser/permissions/permission_context.h" |
| 13 #include "chrome/browser/permissions/permission_context_base.h" | 13 #include "chrome/browser/permissions/permission_context_base.h" |
| 14 #include "chrome/browser/permissions/permission_request_id.h" | 14 #include "chrome/browser/permissions/permission_request_id.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/tab_contents/tab_util.h" | 16 #include "chrome/browser/tab_contents/tab_util.h" |
| 17 #include "components/content_settings/core/browser/host_content_settings_map.h" | 17 #include "components/content_settings/core/browser/host_content_settings_map.h" |
| 18 #include "content/public/browser/permission_type.h" | 18 #include "content/public/browser/permission_type.h" |
| 19 #include "content/public/browser/render_frame_host.h" | 19 #include "content/public/browser/render_frame_host.h" |
| 20 #include "content/public/browser/render_process_host.h" | 20 #include "content/public/browser/render_process_host.h" |
| 21 #include "content/public/browser/web_contents.h" | 21 #include "content/public/browser/web_contents.h" |
| 22 | 22 |
| 23 #if !defined(OS_ANDROID) | 23 #if !defined(OS_ANDROID) |
| 24 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" | 24 #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" |
| 25 #endif | 25 #endif |
| 26 | 26 |
| 27 using content::PermissionStatus; | 27 using content::mojom::PermissionStatus; |
| 28 using content::PermissionType; | 28 using content::PermissionType; |
| 29 | 29 |
| 30 namespace { | 30 namespace { |
| 31 | 31 |
| 32 // Helper method to convert ContentSetting to PermissionStatus. | 32 // Helper method to convert ContentSetting to PermissionStatus. |
| 33 PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { | 33 PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { |
| 34 switch (setting) { | 34 switch (setting) { |
| 35 case CONTENT_SETTING_ALLOW: | 35 case CONTENT_SETTING_ALLOW: |
| 36 case CONTENT_SETTING_SESSION_ONLY: | 36 case CONTENT_SETTING_SESSION_ONLY: |
| 37 return content::PermissionStatus::GRANTED; | 37 return content::mojom::PermissionStatus::GRANTED; |
| 38 case CONTENT_SETTING_BLOCK: | 38 case CONTENT_SETTING_BLOCK: |
| 39 return content::PermissionStatus::DENIED; | 39 return content::mojom::PermissionStatus::DENIED; |
| 40 case CONTENT_SETTING_ASK: | 40 case CONTENT_SETTING_ASK: |
| 41 return content::PermissionStatus::ASK; | 41 return content::mojom::PermissionStatus::ASK; |
| 42 case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT: | 42 case CONTENT_SETTING_DETECT_IMPORTANT_CONTENT: |
| 43 case CONTENT_SETTING_DEFAULT: | 43 case CONTENT_SETTING_DEFAULT: |
| 44 case CONTENT_SETTING_NUM_SETTINGS: | 44 case CONTENT_SETTING_NUM_SETTINGS: |
| 45 break; | 45 break; |
| 46 } | 46 } |
| 47 | 47 |
| 48 NOTREACHED(); | 48 NOTREACHED(); |
| 49 return content::PermissionStatus::DENIED; | 49 return content::mojom::PermissionStatus::DENIED; |
| 50 } | 50 } |
| 51 | 51 |
| 52 // Wrap a callback taking a PermissionStatus to pass it as a callback taking a | 52 // Wrap a callback taking a PermissionStatus to pass it as a callback taking a |
| 53 // ContentSetting. | 53 // ContentSetting. |
| 54 void ContentSettingToPermissionStatusCallbackWrapper( | 54 void ContentSettingToPermissionStatusCallbackWrapper( |
| 55 const base::Callback<void(PermissionStatus)>& callback, | 55 const base::Callback<void(PermissionStatus)>& callback, |
| 56 ContentSetting setting) { | 56 ContentSetting setting) { |
| 57 callback.Run(ContentSettingToPermissionStatus(setting)); | 57 callback.Run(ContentSettingToPermissionStatus(setting)); |
| 58 } | 58 } |
| 59 | 59 |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 class PermissionManager::PendingRequest { | 141 class PermissionManager::PendingRequest { |
| 142 public: | 142 public: |
| 143 PendingRequest(content::RenderFrameHost* render_frame_host, | 143 PendingRequest(content::RenderFrameHost* render_frame_host, |
| 144 const std::vector<PermissionType> permissions, | 144 const std::vector<PermissionType> permissions, |
| 145 const base::Callback< | 145 const base::Callback< |
| 146 void(const std::vector<PermissionStatus>&)>& callback) | 146 void(const std::vector<PermissionStatus>&)>& callback) |
| 147 : render_process_id_(render_frame_host->GetProcess()->GetID()), | 147 : render_process_id_(render_frame_host->GetProcess()->GetID()), |
| 148 render_frame_id_(render_frame_host->GetRoutingID()), | 148 render_frame_id_(render_frame_host->GetRoutingID()), |
| 149 callback_(callback), | 149 callback_(callback), |
| 150 permissions_(permissions), | 150 permissions_(permissions), |
| 151 results_(permissions.size(), content::PermissionStatus::DENIED), | 151 results_(permissions.size(), content::mojom::PermissionStatus::DENIED), |
| 152 remaining_results_(permissions.size()) {} | 152 remaining_results_(permissions.size()) {} |
| 153 | 153 |
| 154 void SetPermissionStatus(int permission_id, PermissionStatus status) { | 154 void SetPermissionStatus(int permission_id, PermissionStatus status) { |
| 155 DCHECK(!IsComplete()); | 155 DCHECK(!IsComplete()); |
| 156 | 156 |
| 157 results_[permission_id] = status; | 157 results_[permission_id] = status; |
| 158 --remaining_results_; | 158 --remaining_results_; |
| 159 } | 159 } |
| 160 | 160 |
| 161 bool IsComplete() const { | 161 bool IsComplete() const { |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 | 319 |
| 320 PermissionStatus PermissionManager::GetPermissionStatus( | 320 PermissionStatus PermissionManager::GetPermissionStatus( |
| 321 PermissionType permission, | 321 PermissionType permission, |
| 322 const GURL& requesting_origin, | 322 const GURL& requesting_origin, |
| 323 const GURL& embedding_origin) { | 323 const GURL& embedding_origin) { |
| 324 if (IsConstantPermission(permission)) | 324 if (IsConstantPermission(permission)) |
| 325 return GetPermissionStatusForConstantPermission(permission); | 325 return GetPermissionStatusForConstantPermission(permission); |
| 326 | 326 |
| 327 PermissionContextBase* context = PermissionContext::Get(profile_, permission); | 327 PermissionContextBase* context = PermissionContext::Get(profile_, permission); |
| 328 if (!context) | 328 if (!context) |
| 329 return content::PermissionStatus::DENIED; | 329 return content::mojom::PermissionStatus::DENIED; |
| 330 | 330 |
| 331 return ContentSettingToPermissionStatus(context->GetPermissionStatus( | 331 return ContentSettingToPermissionStatus(context->GetPermissionStatus( |
| 332 requesting_origin.GetOrigin(), embedding_origin.GetOrigin())); | 332 requesting_origin.GetOrigin(), embedding_origin.GetOrigin())); |
| 333 } | 333 } |
| 334 | 334 |
| 335 void PermissionManager::RegisterPermissionUsage(PermissionType permission, | 335 void PermissionManager::RegisterPermissionUsage(PermissionType permission, |
| 336 const GURL& requesting_origin, | 336 const GURL& requesting_origin, |
| 337 const GURL& embedding_origin) { | 337 const GURL& embedding_origin) { |
| 338 // This is required because constant permissions don't have a | 338 // This is required because constant permissions don't have a |
| 339 // ContentSettingsType. | 339 // ContentSettingsType. |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 422 // Add the callback to |callbacks| which will be run after the loop to | 422 // Add the callback to |callbacks| which will be run after the loop to |
| 423 // prevent re-entrance issues. | 423 // prevent re-entrance issues. |
| 424 callbacks.push_back( | 424 callbacks.push_back( |
| 425 base::Bind(subscription->callback, | 425 base::Bind(subscription->callback, |
| 426 ContentSettingToPermissionStatus(new_value))); | 426 ContentSettingToPermissionStatus(new_value))); |
| 427 } | 427 } |
| 428 | 428 |
| 429 for (const auto& callback : callbacks) | 429 for (const auto& callback : callbacks) |
| 430 callback.Run(); | 430 callback.Run(); |
| 431 } | 431 } |
| OLD | NEW |