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

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

Issue 2264583003: [HBD] Map ASK to DETECT_IMPORTANT_CONTENT when PreferHtmlOverPlugins is enabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "chrome/browser/plugins/plugins_field_trial.h"
6
7 #include "base/feature_list.h"
8 #include "chrome/common/chrome_features.h"
9
10 // static
11 ContentSetting PluginsFieldTrial::EffectiveContentSetting(
12 ContentSettingsType type,
13 ContentSetting setting) {
14 if (type != CONTENT_SETTINGS_TYPE_PLUGINS ||
15 setting != ContentSetting::CONTENT_SETTING_ASK) {
16 return setting;
17 }
18
19 // For Plugins, ASK is obsolete. Show as BLOCK or, if PreferHtmlOverPlugins
20 // feature is enabled, as DETECT_IMPORTANT_CONTENT to reflect actual behavior.
21 return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)
22 ? ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT
23 : ContentSetting::CONTENT_SETTING_BLOCK;
24 }
OLDNEW
« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.h ('k') | chrome/browser/ui/website_settings/permission_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698