Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 10782038: Revert 147045 - Bring up a content settings icon for ungestured registerProtocolHandler call. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 5 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
6 6
7 #include <list> 7 #include <list>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 TabSpecificContentSettings::SiteDataObserver::~SiteDataObserver() { 67 TabSpecificContentSettings::SiteDataObserver::~SiteDataObserver() {
68 tab_specific_content_settings_->RemoveSiteDataObserver(this); 68 tab_specific_content_settings_->RemoveSiteDataObserver(this);
69 } 69 }
70 70
71 TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab) 71 TabSpecificContentSettings::TabSpecificContentSettings(WebContents* tab)
72 : content::WebContentsObserver(tab), 72 : content::WebContentsObserver(tab),
73 profile_(Profile::FromBrowserContext(tab->GetBrowserContext())), 73 profile_(Profile::FromBrowserContext(tab->GetBrowserContext())),
74 allowed_local_shared_objects_(profile_), 74 allowed_local_shared_objects_(profile_),
75 blocked_local_shared_objects_(profile_), 75 blocked_local_shared_objects_(profile_),
76 geolocation_settings_state_(profile_), 76 geolocation_settings_state_(profile_),
77 pending_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
78 previous_protocol_handler_(ProtocolHandler::EmptyProtocolHandler()),
79 pending_protocol_handler_setting_(CONTENT_SETTING_DEFAULT),
80 load_plugins_link_enabled_(true) { 77 load_plugins_link_enabled_(true) {
81 ClearBlockedContentSettingsExceptForCookies(); 78 ClearBlockedContentSettingsExceptForCookies();
82 ClearCookieSpecificContentSettings(); 79 ClearCookieSpecificContentSettings();
83 g_tab_specific.Get().push_back(this); 80 g_tab_specific.Get().push_back(this);
84 81
85 registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED, 82 registrar_.Add(this, chrome::NOTIFICATION_CONTENT_SETTINGS_CHANGED,
86 content::Source<HostContentSettingsMap>( 83 content::Source<HostContentSettingsMap>(
87 profile_->GetHostContentSettingsMap())); 84 profile_->GetHostContentSettingsMap()));
88 } 85 }
89 86
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 } 534 }
538 535
539 void TabSpecificContentSettings::RemoveSiteDataObserver( 536 void TabSpecificContentSettings::RemoveSiteDataObserver(
540 SiteDataObserver* observer) { 537 SiteDataObserver* observer) {
541 observer_list_.RemoveObserver(observer); 538 observer_list_.RemoveObserver(observer);
542 } 539 }
543 540
544 void TabSpecificContentSettings::NotifySiteDataObservers() { 541 void TabSpecificContentSettings::NotifySiteDataObservers() {
545 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed()); 542 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
546 } 543 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698