summaryrefslogtreecommitdiffstats
path: root/chrome/browser/content_settings/tab_specific_content_settings.cc
diff options
context:
space:
mode:
authorgbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 19:48:31 +0000
committergbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-29 19:48:31 +0000
commit9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e (patch)
treec3de5935295407cfbdd92340b901f269d1f99362 /chrome/browser/content_settings/tab_specific_content_settings.cc
parentaeb8c4e81fb57be3175a034ba35298564791a0f1 (diff)
downloadchromium_src-9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e.zip
chromium_src-9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e.tar.gz
chromium_src-9b4d241c97a4b8ffa267e4c08d5c23ff8ba11a2e.tar.bz2
Revert 144957 - Bring up a content settings icon for ungestured registerProtocolHandler call.
R=benwells@chromium.org BUG=122020 TEST=None Review URL: https://chromiumcodereview.appspot.com/10584042 TBR=gbillock@chromium.org Review URL: https://chromiumcodereview.appspot.com/10690051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/tab_specific_content_settings.cc')
-rw-r--r--chrome/browser/content_settings/tab_specific_content_settings.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc
index 50fa8e1..bd28c67 100644
--- a/chrome/browser/content_settings/tab_specific_content_settings.cc
+++ b/chrome/browser/content_settings/tab_specific_content_settings.cc
@@ -74,9 +74,6 @@ 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();