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

Unified Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 2815042: Add notifications content settings type. (Closed)
Patch Set: '' Created 10 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
Index: chrome/browser/tab_contents/tab_contents.cc
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 43c1a1f8bf4babc5e518735c45fbd47e3a578aea..332e32046c2a7b70f0d5b7c4caf1a9ceca13d0c7 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -651,7 +651,11 @@ bool TabContents::ShouldDisplayFavIcon() {
bool TabContents::IsContentBlocked(ContentSettingsType content_type) const {
DCHECK(content_type != CONTENT_SETTINGS_TYPE_GEOLOCATION)
- << "Geolocation settings handled by GeolocationContentSettingsMap";
+ << "Geolocation settings handled by ContentSettingGeolocationImageModel";
+ DCHECK(content_type != CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
+ << "Notifications settings handled by "
+ << "ContentSettingsNotificationsImageModel";
+
if (content_type == CONTENT_SETTINGS_TYPE_POPUPS)
return blocked_popups_ != NULL;
« no previous file with comments | « chrome/browser/host_content_settings_map_unittest.cc ('k') | chrome/browser/views/options/content_filter_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698