chrome/browser/ui/browser_content_setting_bubble_model_delegate.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/browser_content_setting_bubble_model_delegate.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: Review comments. Move to radio buttons 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/ui/browser.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

index 1dedd65d966f562d5d061f9072c2f9552d8e09d4..503cdd13c22c6528660f4d399d8900d04d54f646 100644

--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc

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

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

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

+#include "chrome/common/url_constants.h"

BrowserContentSettingBubbleModelDelegate::

BrowserContentSettingBubbleModelDelegate(Browser* browser) : browser_(browser) {

@@ -22,5 +23,10 @@ void BrowserContentSettingBubbleModelDelegate::ShowCollectedCookiesDialog(

void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage(

ContentSettingsType type) {

+ if (type == CONTENT_SETTINGS_TYPE_REGISTER_PROTOCOL_HANDLER) {

+ chrome::ShowSettingsSubPage(browser_, chrome::kHandlerSettingsSubPage);

+ return;

+ }

chrome::ShowContentSettings(browser_, type);

}