Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(62)

Side by Side Diff: chrome/browser/permissions/permission_context_base.cc

Issue 2069343002: Pass profile to PermissionUmaUtil::PermissionIgnored (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@add-hooks-to-permission-layer
Patch Set: merge Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 170 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
171 171
172 #if !defined(OS_ANDROID) 172 #if !defined(OS_ANDROID)
173 PermissionRequestManager* permission_request_manager = 173 PermissionRequestManager* permission_request_manager =
174 PermissionRequestManager::FromWebContents(web_contents); 174 PermissionRequestManager::FromWebContents(web_contents);
175 // TODO(felt): sometimes |permission_request_manager| is null. This check is 175 // TODO(felt): sometimes |permission_request_manager| is null. This check is
176 // meant to prevent crashes. See crbug.com/457091. 176 // meant to prevent crashes. See crbug.com/457091.
177 if (!permission_request_manager) 177 if (!permission_request_manager)
178 return; 178 return;
179 std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl( 179 std::unique_ptr<PermissionRequest> request_ptr(new PermissionRequestImpl(
180 requesting_origin, permission_type_, 180 requesting_origin, permission_type_, profile_,
181 base::Bind(&PermissionContextBase::PermissionDecided, 181 base::Bind(&PermissionContextBase::PermissionDecided,
182 weak_factory_.GetWeakPtr(), id, requesting_origin, 182 weak_factory_.GetWeakPtr(), id, requesting_origin,
183 embedding_origin, callback), 183 embedding_origin, callback),
184 base::Bind(&PermissionContextBase::CleanUpRequest, 184 base::Bind(&PermissionContextBase::CleanUpRequest,
185 weak_factory_.GetWeakPtr(), id))); 185 weak_factory_.GetWeakPtr(), id)));
186 PermissionRequest* request = request_ptr.get(); 186 PermissionRequest* request = request_ptr.get();
187 187
188 bool inserted = 188 bool inserted =
189 pending_requests_.add(id.ToString(), std::move(request_ptr)).second; 189 pending_requests_.add(id.ToString(), std::move(request_ptr)).second;
190 DCHECK(inserted) << "Duplicate id " << id.ToString(); 190 DCHECK(inserted) << "Duplicate id " << id.ToString();
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 content_setting); 286 content_setting);
287 } 287 }
288 288
289 bool PermissionContextBase::IsPermissionKillSwitchOn() const { 289 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
290 const std::string param = variations::GetVariationParamValue( 290 const std::string param = variations::GetVariationParamValue(
291 kPermissionsKillSwitchFieldStudy, 291 kPermissionsKillSwitchFieldStudy,
292 PermissionUtil::GetPermissionString(permission_type_)); 292 PermissionUtil::GetPermissionString(permission_type_));
293 293
294 return param == kPermissionsKillSwitchBlockedValue; 294 return param == kPermissionsKillSwitchBlockedValue;
295 } 295 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698