chrome/browser/content_settings/content_settings_utils.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/content_settings/content_settings_utils.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: Repair merge 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

« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider.cc ('k') | chrome/browser/content_settings/tab_specific_content_settings.h » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_utils.cc

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

index 7a1a8e7b41618968c3e1248e7d0a2c6cbde53dad..44d08789aa01451694d56c3cc4a58b97a34b532e 100644

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

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

@@ -35,7 +35,8 @@ const char* kTypeNames[] = {

"fullscreen",

"mouselock",

"mixed-script",

- "media-stream"

+ "media-stream",

+ "register-protocol-handler"

Bernhard Bauer 2012/06/26 20:17:49 Nit: If you append a comma, it makes diffs ever so

Greg Billock 2012/06/26 20:31:41 Done. That bit me in this merge, where it took way

};

COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,

type_names_incorrect_size);