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

Unified Diff: chrome/browser/ui/website_settings/permission_menu_model.cc

Issue 1084123002: Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gyp shuffle for ios Created 5 years, 8 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/ui/website_settings/permission_menu_model.cc
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.cc b/chrome/browser/ui/website_settings/permission_menu_model.cc
index bfacff93f904229bfa76f27d7c65ffb252942f7c..19a39f93c6a263f695892bea6e7c9889da01e900 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.cc
+++ b/chrome/browser/ui/website_settings/permission_menu_model.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/website_settings/permission_menu_model.h"
-#include "chrome/browser/plugins/plugins_field_trial.h"
#include "chrome/grit/generated_resources.h"
+#include "components/content_settings/core/browser/plugins_field_trial.h"
#include "ui/base/l10n/l10n_util.h"
PermissionMenuModel::PermissionMenuModel(
@@ -19,8 +19,9 @@ PermissionMenuModel::PermissionMenuModel(
ContentSetting effective_default_setting = permission_.default_setting;
#if defined(ENABLE_PLUGINS)
- effective_default_setting = PluginsFieldTrial::EffectiveContentSetting(
- permission_.type, permission_.default_setting);
+ effective_default_setting =
+ content_settings::PluginsFieldTrial::EffectiveContentSetting(
+ permission_.type, permission_.default_setting);
#endif // defined(ENABLE_PLUGINS)
switch (effective_default_setting) {
@@ -99,8 +100,8 @@ bool PermissionMenuModel::IsCommandIdChecked(int command_id) const {
ContentSetting setting = permission_.setting;
#if defined(ENABLE_PLUGINS)
- setting = PluginsFieldTrial::EffectiveContentSetting(permission_.type,
- permission_.setting);
+ setting = content_settings::PluginsFieldTrial::EffectiveContentSetting(
+ permission_.type, permission_.setting);
#endif // defined(ENABLE_PLUGINS)
return setting == command_id;
« no previous file with comments | « chrome/browser/resources/options/content_settings.js ('k') | chrome/browser/ui/website_settings/website_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698