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

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

Issue 25084003: Make sure we clear registerProtocolHandler settings on page navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 691 matching lines...) Expand 10 before | Expand all | Expand 10 after
702 if (!is_main_frame) 702 if (!is_main_frame)
703 return; 703 return;
704 704
705 // If we're displaying a network error page do not reset the content 705 // If we're displaying a network error page do not reset the content
706 // settings delegate's cookies so the user has a chance to modify cookie 706 // settings delegate's cookies so the user has a chance to modify cookie
707 // settings. 707 // settings.
708 if (!is_error_page) 708 if (!is_error_page)
709 ClearCookieSpecificContentSettings(); 709 ClearCookieSpecificContentSettings();
710 ClearGeolocationContentSettings(); 710 ClearGeolocationContentSettings();
711 ClearMIDIContentSettings(); 711 ClearMIDIContentSettings();
712 ClearPendingProtocolHandler();
712 } 713 }
713 714
714 void TabSpecificContentSettings::AppCacheAccessed(const GURL& manifest_url, 715 void TabSpecificContentSettings::AppCacheAccessed(const GURL& manifest_url,
715 bool blocked_by_policy) { 716 bool blocked_by_policy) {
716 if (blocked_by_policy) { 717 if (blocked_by_policy) {
717 blocked_local_shared_objects_.appcaches()->AddAppCache(manifest_url); 718 blocked_local_shared_objects_.appcaches()->AddAppCache(manifest_url);
718 OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string()); 719 OnContentBlocked(CONTENT_SETTINGS_TYPE_COOKIES, std::string());
719 } else { 720 } else {
720 allowed_local_shared_objects_.appcaches()->AddAppCache(manifest_url); 721 allowed_local_shared_objects_.appcaches()->AddAppCache(manifest_url);
721 OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES); 722 OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
753 } 754 }
754 755
755 void TabSpecificContentSettings::RemoveSiteDataObserver( 756 void TabSpecificContentSettings::RemoveSiteDataObserver(
756 SiteDataObserver* observer) { 757 SiteDataObserver* observer) {
757 observer_list_.RemoveObserver(observer); 758 observer_list_.RemoveObserver(observer);
758 } 759 }
759 760
760 void TabSpecificContentSettings::NotifySiteDataObservers() { 761 void TabSpecificContentSettings::NotifySiteDataObservers() {
761 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed()); 762 FOR_EACH_OBSERVER(SiteDataObserver, observer_list_, OnSiteDataAccessed());
762 } 763 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698