chrome/browser/content_settings/tab_specific_content_settings.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/tab_specific_content_settings.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: Fix merge Created 8 years, 5 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/tab_specific_content_settings.h ('k') | chrome/browser/ui/browser.h » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/tab_specific_content_settings.cc

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

index bd28c67b014602c7aa80edb9b97b914bbc4a2632..50fa8e1eb4a33cb0e46170051ef26e14e7b4dc08 100644

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

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

@@ -74,6 +74,9 @@ TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)

allowed_local_shared_objects_(profile_),

blocked_local_shared_objects_(profile_),

geolocation_settings_state_(profile_),

+ pending_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),

+ previous_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),

+ pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),

load_plugins_link_enabled_(true) {

ClearBlockedContentSettingsExceptForCookies();

ClearCookieSpecificContentSettings();