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..dea7dbf236f6229f64fc839b6767419208567568 100644 |
--- a/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm |
+++ b/chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm |
@@ -281,9 +281,8 @@ 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 { |
+- (void)showWithDelegate:(PermissionPrompt::Delegate*)delegate { |
+ const std::vector<PermissionRequest*>& requests = delegate->Requests(); |
raymes
2017/05/11 01:17:54
nit: move this below the 3 lines below?
Timothy Loh
2017/05/11 04:42:08
I re-arranged it a bit.
|
DCHECK(!requests.empty()); |
DCHECK(delegate); |
delegate_ = delegate; |
@@ -323,10 +322,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 |