chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 12209110: Fix ContentSettingBubbleControllerTest.Init

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

Issue 12209110: Fix ContentSettingBubbleControllerTest.Init (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: better Created 7 years, 10 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/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm » ('j') | chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

index 5e856a11ba2de79dda8146ae3a3ad456303d9195..369df1829537e03b8a45b8d9f107e7d2f80d8bca 100644

--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm

@@ -123,6 +123,7 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {

nibPath = @"ContentBlockedCookies"; break;

case CONTENT_SETTINGS_TYPE_IMAGES:

case CONTENT_SETTINGS_TYPE_JAVASCRIPT:

+ case CONTENT_SETTINGS_TYPE_MEDIASTREAM:

case CONTENT_SETTINGS_TYPE_PPAPI_BROKER:

nibPath = @"ContentBlockedSimple"; break;

case CONTENT_SETTINGS_TYPE_PLUGINS:

@@ -135,8 +136,6 @@ NSTextField* LabelWithFrame(NSString* text, const NSRect& frame) {

nibPath = @"ContentBlockedMixedScript"; break;

case CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS:

nibPath = @"ContentProtocolHandlers"; break;

- case CONTENT_SETTINGS_TYPE_MEDIASTREAM:

- nibPath = @"ContentBlockedMedia"; break;

// These content types have no bubble:

case CONTENT_SETTINGS_TYPE_DEFAULT:

case CONTENT_SETTINGS_TYPE_NOTIFICATIONS: