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

Side by Side Diff: chrome/browser/plugins/plugins_field_trial.cc

Issue 2285553002: [HBD] Gate the advertising of Flash on Site Engagement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address nit Created 4 years, 3 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
« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/plugins/plugins_field_trial.h" 5 #include "chrome/browser/plugins/plugins_field_trial.h"
6 6
7 #include "base/feature_list.h" 7 #include "base/feature_list.h"
8 #include "base/strings/string_number_conversions.h"
8 #include "chrome/common/chrome_features.h" 9 #include "chrome/common/chrome_features.h"
10 #include "components/variations/variations_associated_data.h"
11
12 namespace {
13
14 // The default site engagement threshold to allow Flash to be presented as an
15 // available plugin.
16 const double kSiteEngagementThresholdForFlash = 1.0;
17
18 } // namespace
19
20 // static
21 const char* PluginsFieldTrial::kSiteEngagementThresholdForFlashKey =
22 "engagement_threshold_for_flash";
9 23
10 // static 24 // static
11 ContentSetting PluginsFieldTrial::EffectiveContentSetting( 25 ContentSetting PluginsFieldTrial::EffectiveContentSetting(
12 ContentSettingsType type, 26 ContentSettingsType type,
13 ContentSetting setting) { 27 ContentSetting setting) {
14 if (type != CONTENT_SETTINGS_TYPE_PLUGINS || 28 if (type != CONTENT_SETTINGS_TYPE_PLUGINS ||
15 setting != ContentSetting::CONTENT_SETTING_ASK) { 29 setting != ContentSetting::CONTENT_SETTING_ASK) {
16 return setting; 30 return setting;
17 } 31 }
18 32
19 // For Plugins, ASK is obsolete. Show as BLOCK or, if PreferHtmlOverPlugins 33 // For Plugins, ASK is obsolete. Show as BLOCK or, if PreferHtmlOverPlugins
20 // feature is enabled, as DETECT_IMPORTANT_CONTENT to reflect actual behavior. 34 // feature is enabled, as DETECT_IMPORTANT_CONTENT to reflect actual behavior.
21 return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins) 35 return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)
22 ? ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT 36 ? ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT
23 : ContentSetting::CONTENT_SETTING_BLOCK; 37 : ContentSetting::CONTENT_SETTING_BLOCK;
24 } 38 }
39
40 // static
41 double PluginsFieldTrial::GetSiteEngagementThresholdForFlash() {
42 double threshold = -1;
43 std::string param = variations::GetVariationParamValueByFeature(
44 features::kPreferHtmlOverPlugins,
45 PluginsFieldTrial::kSiteEngagementThresholdForFlashKey);
46 if (base::StringToDouble(param, &threshold) && threshold >= 0)
47 return threshold;
48 return kSiteEngagementThresholdForFlash;
49 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.h ('k') | chrome/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698