chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm - Issue 2385063005: Make PermissionRequest::GetIconId return different types

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/website_settings/permission_bubble_controller.mm

Issue 2385063005: Make PermissionRequest::GetIconId return different types (Closed)

Patch Set: android Created 4 years, 2 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/permissions/permission_request_impl.cc ('K') | « chrome/browser/permissions/permission_update_infobar_delegate_android.cc ('k') | chrome/browser/ui/views/website_settings/permission_prompt_impl.cc » ('j') | ui/gfx/vector_icons/microphone.icon » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

index bc593c1bfb61cda12898ea55b013bb008f06be50..71628be06c4218951884dca3ea7f3b7f8659c027 100644

--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm

@@ -509,9 +509,9 @@ const NSInteger kFullscreenLeftOffset = 40;

[[NSView alloc] initWithFrame:NSZeroRect]);

base::scoped_nsobject<NSImageView> permissionIcon(

[[NSImageView alloc] initWithFrame:NSZeroRect]);

- [permissionIcon setImage:NSImageFromImageSkia(

- gfx::CreateVectorIcon(request->GetVectorIconId(), 18,

- gfx::kChromeIconGrey))];

+ [permissionIcon

+ setImage:NSImageFromImageSkia(gfx::CreateVectorIcon(

+ request->GetIconId(), 18, gfx::kChromeIconGrey))];

[permissionIcon setFrameSize:kPermissionIconSize];

[permissionView addSubview:permissionIcon];