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::CleanUpBubble, | 185 base::Bind(&PermissionContextBase::CleanUpBubble, |
186 weak_factory_.GetWeakPtr(), id))); | 186 weak_factory_.GetWeakPtr(), id))); |
187 PermissionBubbleRequest* request = request_ptr.get(); | 187 PermissionBubbleRequest* request = request_ptr.get(); |
188 | 188 |
189 bool inserted = | 189 bool inserted = |
190 pending_bubbles_.add(id.ToString(), std::move(request_ptr)).second; | 190 pending_bubbles_.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): Get user gesture from infobar. | |
195 GetQueueController()->CreateInfoBarRequest( | 194 GetQueueController()->CreateInfoBarRequest( |
196 id, requesting_origin, embedding_origin, | 195 id, requesting_origin, embedding_origin, user_gesture, |
197 base::Bind(&PermissionContextBase::PermissionDecided, | 196 base::Bind(&PermissionContextBase::PermissionDecided, |
198 weak_factory_.GetWeakPtr(), id, requesting_origin, | 197 weak_factory_.GetWeakPtr(), id, requesting_origin, |
199 embedding_origin, user_gesture, callback, | 198 embedding_origin, user_gesture, callback, |
200 // the queue controller takes care of persisting the | 199 // the queue controller takes care of persisting the |
201 // permission | 200 // permission |
202 false)); | 201 false)); |
203 #endif | 202 #endif |
204 } | 203 } |
205 | 204 |
206 void PermissionContextBase::PermissionDecided( | 205 void PermissionContextBase::PermissionDecided( |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
289 content_setting); | 288 content_setting); |
290 } | 289 } |
291 | 290 |
292 bool PermissionContextBase::IsPermissionKillSwitchOn() const { | 291 bool PermissionContextBase::IsPermissionKillSwitchOn() const { |
293 const std::string param = variations::GetVariationParamValue( | 292 const std::string param = variations::GetVariationParamValue( |
294 kPermissionsKillSwitchFieldStudy, | 293 kPermissionsKillSwitchFieldStudy, |
295 PermissionUtil::GetPermissionString(permission_type_)); | 294 PermissionUtil::GetPermissionString(permission_type_)); |
296 | 295 |
297 return param == kPermissionsKillSwitchBlockedValue; | 296 return param == kPermissionsKillSwitchBlockedValue; |
298 } | 297 } |
OLD | NEW |