chrome/browser/plugins/plugin_info_message_filter.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/plugins/plugin_info_message_filter.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: gn fixes 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/about_flags.cc ('k') | chrome/browser/plugins/plugins_field_trial.h » ('j') | chrome/browser/plugins/plugins_field_trial_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/plugins/plugin_info_message_filter.cc

diff --git a/chrome/browser/plugins/plugin_info_message_filter.cc b/chrome/browser/plugins/plugin_info_message_filter.cc

index 657357c71703c311a8b9f877ce86c486f5581c44..66618f0ad95457570269cf1e49ce87c58983d006 100644

--- a/chrome/browser/plugins/plugin_info_message_filter.cc

+++ b/chrome/browser/plugins/plugin_info_message_filter.cc

@@ -15,13 +15,13 @@

#include "chrome/browser/plugins/plugin_finder.h"

#include "chrome/browser/plugins/plugin_metadata.h"

#include "chrome/browser/plugins/plugin_prefs.h"

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser_otr_state.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "components/content_settings/core/browser/content_settings_utils.h"

#include "components/content_settings/core/browser/host_content_settings_map.h"

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

#include "components/content_settings/core/common/content_settings.h"

#include "components/rappor/rappor_service.h"

#include "content/public/browser/browser_thread.h"

@@ -361,7 +361,7 @@ void PluginInfoMessageFilter::Context::DecidePluginStatus(

plugin_metadata->identifier(), &plugin_setting,

&uses_default_content_setting, &is_managed);

- plugin_setting = PluginsFieldTrial::EffectiveContentSetting(

+ plugin_setting = content_settings::PluginsFieldTrial::EffectiveContentSetting(

CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);

DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/plugins/plugins_field_trial.h » ('j') | chrome/browser/plugins/plugins_field_trial_browsertest.cc » ('J')