chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm - Issue 2171713002: Safe browsing subresource filter bubble UI skeleton.

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 2171713002: Safe browsing subresource filter bubble UI skeleton. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove empty line Created 4 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/content_settings/tab_specific_content_settings.cc ('K') | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.h » ('j') | chrome/browser/ui/content_settings/content_setting_bubble_model.h » ('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 d22342117b84979dbb9ae8b600294c0caf02bb3f..24f5f1a715cf61da4cb69b8b27a34d6152a74538 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

@@ -285,6 +285,9 @@ const ContentTypeToNibPath kNibPaths[] = {

if (model->AsMediaStreamBubbleModel())

nibPath = @"ContentBlockedMedia";

+ if (model->AsSubresourceFilterBubbleModel())

Bernhard Bauer 2016/07/27 19:27:44 Doing all of these checks in sequence feels a bit

melandory 2016/07/28 14:04:56 Done.

+ nibPath = @"ContentSubresourceFilter";

DCHECK_NE(0u, [nibPath length]);

if ((self = [super initWithWindowNibPath:nibPath