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

Unified Diff: chrome/browser/cocoa/content_blocked_bubble_controller.mm

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
« no previous file with comments | « no previous file | chrome/browser/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/cocoa/content_blocked_bubble_controller.mm
diff --git a/chrome/browser/cocoa/content_blocked_bubble_controller.mm b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
index a30b3361c67dcbe45f4c0d3597d39407197fe9d0..d0ae86f4d1c46ea9ef7dd334c30f7f1ba5df3f6f 100644
--- a/chrome/browser/cocoa/content_blocked_bubble_controller.mm
+++ b/chrome/browser/cocoa/content_blocked_bubble_controller.mm
@@ -117,10 +117,13 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {
@"ContentBlockedPlugins",
@"ContentBlockedPopups",
@"ContentBubbleGeolocation",
+ @"", // Notifications do not have a bubble.
};
COMPILE_ASSERT(arraysize(nibPaths) == CONTENT_SETTINGS_NUM_TYPES,
nibPaths_requires_an_entry_for_every_setting_type);
const int settingsType = model->content_type();
+ // Nofifications do not have a bubble.
+ CHECK_NE(settingsType, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
DCHECK_LT(settingsType, CONTENT_SETTINGS_NUM_TYPES);
if ((self = [super initWithWindowNibPath:nibPaths[settingsType]
parentWindow:parentWindow
« no previous file with comments | « no previous file | chrome/browser/content_setting_bubble_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698