| 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_base.h" | 5 #include "chrome/browser/permissions/permission_context_base.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 embedding_origin, user_gesture, callback), | 184 embedding_origin, user_gesture, callback), |
| 185 base::Bind(&PermissionContextBase::CleanUpRequest, | 185 base::Bind(&PermissionContextBase::CleanUpRequest, |
| 186 weak_factory_.GetWeakPtr(), id))); | 186 weak_factory_.GetWeakPtr(), id))); |
| 187 PermissionRequest* request = request_ptr.get(); | 187 PermissionRequest* request = request_ptr.get(); |
| 188 | 188 |
| 189 bool inserted = | 189 bool inserted = |
| 190 pending_requests_.add(id.ToString(), std::move(request_ptr)).second; | 190 pending_requests_.add(id.ToString(), std::move(request_ptr)).second; |
| 191 DCHECK(inserted) << "Duplicate id " << id.ToString(); | 191 DCHECK(inserted) << "Duplicate id " << id.ToString(); |
| 192 permission_request_manager->AddRequest(request); | 192 permission_request_manager->AddRequest(request); |
| 193 #else | 193 #else |
| 194 // TODO(stefanocs): Pass |user_gesture| to CreateInfoBarRequest to record | |
| 195 // permission actions in infobar. | |
| 196 GetQueueController()->CreateInfoBarRequest( | 194 GetQueueController()->CreateInfoBarRequest( |
| 197 id, requesting_origin, embedding_origin, | 195 id, requesting_origin, embedding_origin, user_gesture, |
| 198 base::Bind(&PermissionContextBase::PermissionDecided, | 196 base::Bind(&PermissionContextBase::PermissionDecided, |
| 199 weak_factory_.GetWeakPtr(), id, requesting_origin, | 197 weak_factory_.GetWeakPtr(), id, requesting_origin, |
| 200 embedding_origin, user_gesture, callback, | 198 embedding_origin, user_gesture, callback, |
| 201 // the queue controller takes care of persisting the | 199 // the queue controller takes care of persisting the |
| 202 // permission | 200 // permission |
| 203 false)); | 201 false)); |
| 204 #endif | 202 #endif |
| 205 } | 203 } |
| 206 | 204 |
| 207 void PermissionContextBase::PermissionDecided( | 205 void PermissionContextBase::PermissionDecided( |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 content_setting); | 292 content_setting); |
| 295 } | 293 } |
| 296 | 294 |
| 297 bool PermissionContextBase::IsPermissionKillSwitchOn() const { | 295 bool PermissionContextBase::IsPermissionKillSwitchOn() const { |
| 298 const std::string param = variations::GetVariationParamValue( | 296 const std::string param = variations::GetVariationParamValue( |
| 299 kPermissionsKillSwitchFieldStudy, | 297 kPermissionsKillSwitchFieldStudy, |
| 300 PermissionUtil::GetPermissionString(permission_type_)); | 298 PermissionUtil::GetPermissionString(permission_type_)); |
| 301 | 299 |
| 302 return param == kPermissionsKillSwitchBlockedValue; | 300 return param == kPermissionsKillSwitchBlockedValue; |
| 303 } | 301 } |
| OLD | NEW |