Move requests from Show() argument to PermissionPrompt::Delegate

chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.mm

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/permission_bubble/permission_bubble_controller.h"
 
 #include <algorithm>
 
 #include "base/mac/bind_objc_block.h"
 #include "base/macros.h"
@@ skipping 263 matching lines @@
   // Override the base class implementation, which sets the anchor point. But
   // it's not necessary since BrowserWindowController will notify the
   // PermissionRequestManager to update the anchor position on a resize.
 }
 
 - (void)parentWindowDidMove:(NSNotification*)notification {
   DCHECK(bridge_);
   [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;
 
   NSView* contentView = [[self window] contentView];
   [contentView setSubviews:@[]];
 
   BOOL singlePermission = requests.size() == 1;
 
   // Create one button to use as a guide for the permissions' y-offsets.
@@ skipping 19 matching lines @@
     base::scoped_nsobject<NSView> permissionView(
         [[self labelForRequest:(*it)] retain]);
     NSPoint origin = [permissionView frame].origin;
     origin.x += kHorizontalPadding;
     origin.y += yOffset + verticalPadding;
     [permissionView setFrameOrigin:origin];
     [contentView addSubview:permissionView];
 
     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
                            verticallyToCenterOf:permissionView];
       [permissionMenus addObject:menu];
       [contentView addSubview:menu];
     }
     maxPermissionLineWidth = std::max(
         maxPermissionLineWidth, NSMaxX([permissionView frame]));
     yOffset += NSHeight([permissionView frame]);
@@ skipping 281 matching lines @@
 }
 
 - (IBAction)cancel:(id)sender {
   // This is triggered by ESC when the bubble has focus.
   if (delegate_)
     delegate_->Closing();
   [super cancel:sender];
 }
 
 @end  // implementation PermissionBubbleController