chrome/browser/content_settings/content_settings_default_provider.cc - Issue 12225076: Delete most web intents code.

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/content_settings/content_settings_default_provider.cc

Issue 12225076: Delete most web intents code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 10 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/chromeos/extensions/file_browser_private_api.cc ('K') | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/content_settings/content_settings_policy_provider.cc » ('j') | chrome/common/extensions/api/app_runtime.idl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc

index 9a9c738aa6180c1862c9dc5675f4315989330eb5..8816d2b0a9804a6e3825ed4be83ecf516b46a8ac 100644

--- a/chrome/browser/content_settings/content_settings_default_provider.cc

+++ b/chrome/browser/content_settings/content_settings_default_provider.cc

@@ -39,7 +39,6 @@ const ContentSetting kDefaultSettings[] = {

CONTENT_SETTING_BLOCK, // CONTENT_SETTINGS_TYPE_POPUPS

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_GEOLOCATION

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_NOTIFICATIONS

- CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_INTENTS

CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_FULLSCREEN

CONTENT_SETTING_ASK, // CONTENT_SETTINGS_TYPE_MOUSELOCK

@@ -145,11 +144,6 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)

default_settings_[CONTENT_SETTINGS_TYPE_NOTIFICATIONS].get()),

CONTENT_SETTING_NUM_SETTINGS);

UMA_HISTOGRAM_ENUMERATION(

- "ContentSettings.DefaultHandlersSetting",

- ValueToContentSetting(

- default_settings_[CONTENT_SETTINGS_TYPE_INTENTS].get()),

- CONTENT_SETTING_NUM_SETTINGS);

- UMA_HISTOGRAM_ENUMERATION(

"ContentSettings.DefaultMouseCursorSetting",

ValueToContentSetting(

default_settings_[CONTENT_SETTINGS_TYPE_MOUSELOCK].get()),