chrome/browser/ui/webui/options2/content_settings_handler2.cc - Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call.

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/options2/content_settings_handler2.cc

Issue 10584042: Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head. Created 8 years, 6 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/content_settings/content_setting_bubble_model_unittest.cc ('K') | « chrome/browser/ui/views/external_tab_container_win.cc ('k') | chrome/common/content_settings_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options2/content_settings_handler2.cc

diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler2.cc

index d3c12d2cd5bce0d4c0d654027e564b7f15617315..72d0e12c78ed03708ae6d9635279b66c14762f4d 100644

--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc

+++ b/chrome/browser/ui/webui/options2/content_settings_handler2.cc

@@ -338,6 +338,8 @@ const ContentSettingsHandler::ExContentSettingsTypeNameEntry

{CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},

{CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},

{CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, "mixed-script"},

+ {CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER,

+ "register-protocol-handler"},

{EX_CONTENT_SETTINGS_TYPE_PEPPER_FLASH_CAMERAMIC, "pepper-flash-cameramic"},

};