| 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 6b9c781d596ff576b2ce078600303163ad81b06a..e644f4982ac0f637d08f7258c28ec9401d092a62 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 "content/public/common/origin_util.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| @@ -20,9 +20,8 @@ PermissionMenuModel::PermissionMenuModel(
|
| ContentSetting effective_default_setting = permission_.default_setting;
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| - effective_default_setting =
|
| - content_settings::PluginsFieldTrial::EffectiveContentSetting(
|
| - permission_.type, permission_.default_setting);
|
| + effective_default_setting = PluginsFieldTrial::EffectiveContentSetting(
|
| + permission_.type, permission_.default_setting);
|
| #endif // defined(ENABLE_PLUGINS)
|
|
|
| switch (effective_default_setting) {
|
| @@ -108,8 +107,8 @@ bool PermissionMenuModel::IsCommandIdChecked(int command_id) const {
|
| ContentSetting setting = permission_.setting;
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| - setting = content_settings::PluginsFieldTrial::EffectiveContentSetting(
|
| - permission_.type, permission_.setting);
|
| + setting = PluginsFieldTrial::EffectiveContentSetting(permission_.type,
|
| + permission_.setting);
|
| #endif // defined(ENABLE_PLUGINS)
|
|
|
| return setting == command_id;
|
|
|