| Index: chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
|
| index e0b158911316cdbac2a2eab1c9db978aadf5ee53..80539cffb81fdb02fc028201b52f5fe53ed24543 100644
|
| --- a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm
|
| @@ -281,13 +281,13 @@ const NSSize kPermissionIconSize = {18, 18};
|
| [self setAnchorPoint:[self getExpectedAnchorPoint]];
|
| }
|
|
|
| -- (void)showWithDelegate:(PermissionPrompt::Delegate*)delegate
|
| - forRequests:(const std::vector<PermissionRequest*>&)requests
|
| - acceptStates:(const std::vector<bool>&)acceptStates {
|
| - DCHECK(!requests.empty());
|
| +- (void)showWithDelegate:(PermissionPrompt::Delegate*)delegate {
|
| DCHECK(delegate);
|
| delegate_ = delegate;
|
|
|
| + const std::vector<PermissionRequest*>& requests = delegate->Requests();
|
| + DCHECK(!requests.empty());
|
| +
|
| NSView* contentView = [[self window] contentView];
|
| [contentView setSubviews:@[]];
|
|
|
| @@ -323,10 +323,9 @@ const NSSize kPermissionIconSize = {18, 18};
|
|
|
| if (!singlePermission) {
|
| int index = it - requests.begin();
|
| - base::scoped_nsobject<NSView> menu(
|
| - [[self menuForRequest:(*it)
|
| - atIndex:index
|
| - allow:acceptStates[index] ? YES : NO] retain]);
|
| + base::scoped_nsobject<NSView> menu([[self
|
| + menuForRequest:(*it)atIndex:index
|
| + allow:delegate->AcceptStates()[index] ? YES : NO] retain]);
|
| // Align vertically. Horizontal alignment will be adjusted once the
|
| // widest permission is know.
|
| [PermissionBubbleController alignCenterOf:menu
|
|
|