chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm - Issue 10826164: Add infobar for PPAPI broker usage.

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_unittest.mm

Issue 10826164: Add infobar for PPAPI broker usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix merge Created 8 years, 4 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

« chrome/browser/resources/options2/content_settings.html ('K') | « chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm ('k') | chrome/browser/ui/webui/options2/content_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index fe726058803c1696355f83293d7bfd8ca38590c9..f10f9cb52b4de310da322848bfb91a813a5d3316 100644

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

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

@@ -62,7 +62,8 @@ TEST_F(ContentSettingBubbleControllerTest, Init) {

i == CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE ||

i == CONTENT_SETTINGS_TYPE_FULLSCREEN ||

i == CONTENT_SETTINGS_TYPE_MOUSELOCK ||

- i == CONTENT_SETTINGS_TYPE_MEDIASTREAM) {

+ i == CONTENT_SETTINGS_TYPE_MEDIASTREAM ||

+ i == CONTENT_SETTINGS_TYPE_PPAPI_BROKER) {

// These types have no bubble.

continue;

}