chrome/browser/ui/webui/options/content_settings_handler.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/webui/options/content_settings_handler.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/ui/website_settings/website_settings_ui.cc ('K') | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/content_settings_handler.cc

diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc

index 2fd75f0100e7f90863107faff77e2021f6d1dfa3..9f23494b64b77c85bb2c7601449d0b4cab6dc02d 100644

--- a/chrome/browser/ui/webui/options/content_settings_handler.cc

+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc

@@ -32,6 +32,7 @@

#include "chrome/browser/permissions/chooser_context_base.h"

#include "chrome/browser/permissions/permission_uma_util.h"

#include "chrome/browser/permissions/permission_util.h"

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

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

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

#include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"

@@ -48,7 +49,6 @@

#include "components/content_settings/core/browser/content_settings_details.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/browser/website_settings_info.h"

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

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

@@ -729,7 +729,7 @@ void ContentSettingsHandler::UpdateSettingDefaultFromModel(

#if defined(ENABLE_PLUGINS)

default_setting =

- content_settings::PluginsFieldTrial::EffectiveContentSetting(

+ PluginsFieldTrial::EffectiveContentSetting(

type, default_setting);

#endif