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

Side by Side Diff: chrome/browser/tab_contents/tab_contents.cc

Issue 2815042: Add notifications content settings type. (Closed)
Patch Set: '' Created 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/tab_contents/tab_contents.h" 5 #include "chrome/browser/tab_contents/tab_contents.h"
6 6
7 #if defined(OS_CHROMEOS) 7 #if defined(OS_CHROMEOS)
8 // For GdkScreen 8 // For GdkScreen
9 #include <gdk/gdk.h> 9 #include <gdk/gdk.h>
10 #endif // defined(OS_CHROMEOS) 10 #endif // defined(OS_CHROMEOS)
(...skipping 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 return true; 644 return true;
645 645
646 DOMUI* dom_ui = GetDOMUIForCurrentState(); 646 DOMUI* dom_ui = GetDOMUIForCurrentState();
647 if (dom_ui) 647 if (dom_ui)
648 return !dom_ui->hide_favicon(); 648 return !dom_ui->hide_favicon();
649 return true; 649 return true;
650 } 650 }
651 651
652 bool TabContents::IsContentBlocked(ContentSettingsType content_type) const { 652 bool TabContents::IsContentBlocked(ContentSettingsType content_type) const {
653 DCHECK(content_type != CONTENT_SETTINGS_TYPE_GEOLOCATION) 653 DCHECK(content_type != CONTENT_SETTINGS_TYPE_GEOLOCATION)
654 << "Geolocation settings handled by GeolocationContentSettingsMap"; 654 << "Geolocation settings handled by ContentSettingGeolocationImageModel";
655 DCHECK(content_type != CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
656 << "Notifications settings handled by "
657 << "ContentSettingsNotificationsImageModel";
658
655 if (content_type == CONTENT_SETTINGS_TYPE_POPUPS) 659 if (content_type == CONTENT_SETTINGS_TYPE_POPUPS)
656 return blocked_popups_ != NULL; 660 return blocked_popups_ != NULL;
657 661
658 if (content_type == CONTENT_SETTINGS_TYPE_IMAGES || 662 if (content_type == CONTENT_SETTINGS_TYPE_IMAGES ||
659 content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT || 663 content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
660 content_type == CONTENT_SETTINGS_TYPE_PLUGINS || 664 content_type == CONTENT_SETTINGS_TYPE_PLUGINS ||
661 content_type == CONTENT_SETTINGS_TYPE_COOKIES) 665 content_type == CONTENT_SETTINGS_TYPE_COOKIES)
662 return content_blocked_[content_type]; 666 return content_blocked_[content_type];
663 667
664 NOTREACHED(); 668 NOTREACHED();
(...skipping 2512 matching lines...) Expand 10 before | Expand all | Expand 10 after
3177 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save)); 3181 AddInfoBar(new SavePasswordInfoBarDelegate(this, form_to_save));
3178 } 3182 }
3179 3183
3180 Profile* TabContents::GetProfileForPasswordManager() { 3184 Profile* TabContents::GetProfileForPasswordManager() {
3181 return profile(); 3185 return profile();
3182 } 3186 }
3183 3187
3184 bool TabContents::DidLastPageLoadEncounterSSLErrors() { 3188 bool TabContents::DidLastPageLoadEncounterSSLErrors() {
3185 return controller().ssl_manager()->ProcessedSSLErrorFromRequest(); 3189 return controller().ssl_manager()->ProcessedSSLErrorFromRequest();
3186 } 3190 }
OLDNEW
« 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