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

chrome/browser/ui/views/permission_bubble/permission_prompt_impl.cc

 // 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.
 
 #include "chrome/browser/ui/views/permission_bubble/permission_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 384 matching lines @@
       delegate_(nullptr),
       bubble_delegate_(nullptr) {}
 
 PermissionPromptImpl::~PermissionPromptImpl() {
 }
 
 void PermissionPromptImpl::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
-void PermissionPromptImpl::Show(const std::vector<PermissionRequest*>& requests,
-                                const std::vector<bool>& values) {
+void PermissionPromptImpl::Show() {
   DCHECK(browser_);
   DCHECK(browser_->window());
 
-  if (bubble_delegate_)
-    bubble_delegate_->CloseBubble();

[raymes, 2017/05/11 01:17:55]

Should this be removed?

[Timothy Loh, 2017/05/11 04:42:08]

It's dead code (Show is only called when there's no prompt showing), but I'll
leave it in for now since it's not particularly relevant.

-
-  bubble_delegate_ =
-      new PermissionsBubbleDialogDelegateView(this, requests, values);
+  bubble_delegate_ = new PermissionsBubbleDialogDelegateView(
+      this, delegate_->Requests(), delegate_->AcceptStates());
 
   // Set |parent_window| because some valid anchors can become hidden.
   bubble_delegate_->set_parent_window(
       platform_util::GetViewForWindow(browser_->window()->GetNativeWindow()));
 
   // Compensate for vertical padding in the anchor view's image. Note this is
   // ignored whenever the anchor view is null.
   bubble_delegate_->set_anchor_view_insets(gfx::Insets(
       GetLayoutConstant(LOCATION_BAR_BUBBLE_ANCHOR_VERTICAL_INSET), 0));
 
@@ skipping 62 matching lines @@
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 Profile* PermissionPromptImpl::GetProfile() {
   return browser_->profile();
 }