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

Unified Diff: chrome/browser/ui/website_settings/permission_menu_model.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/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;
« no previous file with comments | « chrome/browser/plugins/plugins_field_trial.cc ('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