chrome/browser/ui/website_settings/website_settings_ui.cc - Issue 2264583003: [HBD] Map ASK to DETECT_IMPORTANT_CONTENT when PreferHtmlOverPlugins is enabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/website_settings/website_settings_ui.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: Remove content_settings namespace 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

« chrome/browser/plugins/plugins_field_trial.cc ('K') | « chrome/browser/ui/website_settings/permission_menu_model.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/website_settings_ui.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_ui.cc b/chrome/browser/ui/website_settings/website_settings_ui.cc

index d63d76369ba342aa0d4febf3102bf0f7502bef12..ec085d6d4fda93440674328e3e73fd3b6c0b2422 100644

--- a/chrome/browser/ui/website_settings/website_settings_ui.cc

+++ b/chrome/browser/ui/website_settings/website_settings_ui.cc

@@ -5,9 +5,9 @@

#include "chrome/browser/ui/website_settings/website_settings_ui.h"

#include "base/macros.h"

+#include "chrome/browser/plugins/plugins_field_trial.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

-#include "components/content_settings/core/browser/plugins_field_trial.h"

#include "components/strings/grit/components_strings.h"

#include "grit/theme_resources.h"

#include "ui/base/l10n/l10n_util.h"

@@ -226,7 +226,7 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(

#if defined(ENABLE_PLUGINS)

effective_setting =

- content_settings::PluginsFieldTrial::EffectiveContentSetting(

+ PluginsFieldTrial::EffectiveContentSetting(

Lei Zhang 2016/08/22 17:57:54 Fits on previous line? Just git cl format?

trizzofo 2016/08/22 18:09:36 Done.

type, effective_setting);

#endif