chrome/browser/ui/website_settings/website_settings_ui.cc - Issue 1084123002: Make DETECT_IMPORTANT_CONTENT the default Plugins content setting based

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 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

« no previous file with comments | « 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 80f38dbbb4455b463d359062fc055d5e55a882dc..a186b083515021e26dccc5557a2893554ae49469 100644

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

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

@@ -4,9 +4,9 @@

#include "chrome/browser/ui/website_settings/website_settings_ui.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 "grit/theme_resources.h"

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

#include "ui/base/resource/resource_bundle.h"

@@ -182,7 +182,8 @@ base::string16 WebsiteSettingsUI::PermissionActionToUIString(

#if defined(ENABLE_PLUGINS)

effective_setting =

- PluginsFieldTrial::EffectiveContentSetting(type, effective_setting);

+ content_settings::PluginsFieldTrial::EffectiveContentSetting(

+ type, effective_setting);

#endif

const int* button_text_ids = NULL;