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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/plugins/plugins_field_trial.cc
diff --git a/chrome/browser/plugins/plugins_field_trial.cc b/chrome/browser/plugins/plugins_field_trial.cc
new file mode 100644
index 0000000000000000000000000000000000000000..68d3d957432c554b800687e63d6a6b089bdb82cd
--- /dev/null
+++ b/chrome/browser/plugins/plugins_field_trial.cc
@@ -0,0 +1,24 @@
+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/plugins/plugins_field_trial.h"
+
+#include "base/feature_list.h"
+#include "chrome/common/chrome_features.h"
+
+// static
+ContentSetting PluginsFieldTrial::EffectiveContentSetting(
+ ContentSettingsType type,
+ ContentSetting setting) {
+ if (type != CONTENT_SETTINGS_TYPE_PLUGINS ||
+ setting != ContentSetting::CONTENT_SETTING_ASK) {
+ return setting;
+ }
+
+ // For Plugins, ASK is obsolete. Show as BLOCK or, if PreferHtmlOverPlugins
+ // feature is enabled, as DETECT_IMPORTANT_CONTENT to reflect actual behavior.
+ return base::FeatureList::IsEnabled(features::kPreferHtmlOverPlugins)
+ ? ContentSetting::CONTENT_SETTING_DETECT_IMPORTANT_CONTENT
+ : ContentSetting::CONTENT_SETTING_BLOCK;
+}
« 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