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

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

Issue 2184823007: Add a feature which, when enabled, blocks permissions after X prompt dismissals. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing nits Created 4 years, 4 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/callback.h"
10 #include "base/logging.h" 11 #include "base/logging.h"
11 #include "base/strings/stringprintf.h" 12 #include "base/strings/stringprintf.h"
12 #include "build/build_config.h" 13 #include "build/build_config.h"
13 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 14 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
15 #include "chrome/browser/permissions/permission_decision_auto_blocker.h"
14 #include "chrome/browser/permissions/permission_request.h" 16 #include "chrome/browser/permissions/permission_request.h"
15 #include "chrome/browser/permissions/permission_request_id.h" 17 #include "chrome/browser/permissions/permission_request_id.h"
16 #include "chrome/browser/permissions/permission_uma_util.h" 18 #include "chrome/browser/permissions/permission_uma_util.h"
17 #include "chrome/browser/permissions/permission_util.h" 19 #include "chrome/browser/permissions/permission_util.h"
18 #include "chrome/browser/profiles/profile.h" 20 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
20 #include "components/content_settings/core/browser/host_content_settings_map.h" 22 #include "components/content_settings/core/browser/host_content_settings_map.h"
21 #include "components/content_settings/core/browser/website_settings_registry.h" 23 #include "components/content_settings/core/browser/website_settings_registry.h"
22 #include "components/prefs/pref_service.h" 24 #include "components/prefs/pref_service.h"
23 #include "components/variations/variations_associated_data.h" 25 #include "components/variations/variations_associated_data.h"
24 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
25 #include "content/public/browser/render_frame_host.h" 27 #include "content/public/browser/render_frame_host.h"
26 #include "content/public/browser/web_contents.h" 28 #include "content/public/browser/web_contents.h"
27 #include "content/public/common/origin_util.h" 29 #include "content/public/common/origin_util.h"
30 #include "url/gurl.h"
28 31
29 #if defined(OS_ANDROID) 32 #if defined(OS_ANDROID)
30 #include "chrome/browser/permissions/permission_queue_controller.h" 33 #include "chrome/browser/permissions/permission_queue_controller.h"
31 #else 34 #else
32 #include "chrome/browser/permissions/permission_request_impl.h" 35 #include "chrome/browser/permissions/permission_request_impl.h"
33 #include "chrome/browser/permissions/permission_request_manager.h" 36 #include "chrome/browser/permissions/permission_request_manager.h"
34 #endif 37 #endif
35 38
36 // static 39 // static
37 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] = 40 const char PermissionContextBase::kPermissionsKillSwitchFieldStudy[] =
38 "PermissionsKillSwitch"; 41 "PermissionsKillSwitch";
39 // static 42 // static
40 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] = 43 const char PermissionContextBase::kPermissionsKillSwitchBlockedValue[] =
41 "blocked"; 44 "blocked";
42 45
43 PermissionContextBase::PermissionContextBase( 46 PermissionContextBase::PermissionContextBase(
44 Profile* profile, 47 Profile* profile,
45 const content::PermissionType permission_type, 48 const content::PermissionType permission_type,
46 const ContentSettingsType content_settings_type) 49 const ContentSettingsType content_settings_type)
47 : profile_(profile), 50 : profile_(profile),
51 decision_auto_blocker_(new PermissionDecisionAutoBlocker(profile)),
48 permission_type_(permission_type), 52 permission_type_(permission_type),
49 content_settings_type_(content_settings_type), 53 content_settings_type_(content_settings_type),
50 weak_factory_(this) { 54 weak_factory_(this) {
51 #if defined(OS_ANDROID) 55 #if defined(OS_ANDROID)
52 permission_queue_controller_.reset(new PermissionQueueController( 56 permission_queue_controller_.reset(new PermissionQueueController(
53 profile_, permission_type_, content_settings_type_)); 57 profile_, permission_type_, content_settings_type_));
54 #endif 58 #endif
55 } 59 }
56 60
57 PermissionContextBase::~PermissionContextBase() { 61 PermissionContextBase::~PermissionContextBase() {
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type, 230 PermissionUmaUtil::PermissionDenied(permission_type_, gesture_type,
227 requesting_origin, profile_); 231 requesting_origin, profile_);
228 } 232 }
229 } else { 233 } else {
230 DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT); 234 DCHECK_EQ(content_setting, CONTENT_SETTING_DEFAULT);
231 PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type, 235 PermissionUmaUtil::PermissionDismissed(permission_type_, gesture_type,
232 requesting_origin, profile_); 236 requesting_origin, profile_);
233 } 237 }
234 #endif 238 #endif
235 239
240 // Check if we should convert a dismiss decision into a block decision. This
241 // is gated on enabling the kBlockPromptsIfDismissedOften feature.
242 if (!persist &&
243 decision_auto_blocker_->ShouldChangeDismissalToBlock(requesting_origin,
244 permission_type_)) {
245 persist = true;
246 content_setting = CONTENT_SETTING_BLOCK;
247 }
248
236 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback, 249 NotifyPermissionSet(id, requesting_origin, embedding_origin, callback,
237 persist, content_setting); 250 persist, content_setting);
238 } 251 }
239 252
240 #if defined(OS_ANDROID) 253 #if defined(OS_ANDROID)
241 PermissionQueueController* PermissionContextBase::GetQueueController() { 254 PermissionQueueController* PermissionContextBase::GetQueueController() {
242 return permission_queue_controller_.get(); 255 return permission_queue_controller_.get();
243 } 256 }
244 #endif 257 #endif
245 258
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 content_setting); 305 content_setting);
293 } 306 }
294 307
295 bool PermissionContextBase::IsPermissionKillSwitchOn() const { 308 bool PermissionContextBase::IsPermissionKillSwitchOn() const {
296 const std::string param = variations::GetVariationParamValue( 309 const std::string param = variations::GetVariationParamValue(
297 kPermissionsKillSwitchFieldStudy, 310 kPermissionsKillSwitchFieldStudy,
298 PermissionUtil::GetPermissionString(permission_type_)); 311 PermissionUtil::GetPermissionString(permission_type_));
299 312
300 return param == kPermissionsKillSwitchBlockedValue; 313 return param == kPermissionsKillSwitchBlockedValue;
301 } 314 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698