Fix cancelling permission requests on Android when the PermissionRequestManager is enabled

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 389 matching lines @@
 
 void PermissionPromptImpl::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionPromptImpl::Show(const std::vector<PermissionRequest*>& requests,
                                 const std::vector<bool>& values) {
   DCHECK(browser_);
   DCHECK(browser_->window());
 
-  if (bubble_delegate_)
-    bubble_delegate_->CloseBubble();
+  if (IsVisible()) {
+    // We just rejected a MaybeCancelRequest() call.
+    return;
+  }
 
   bubble_delegate_ =
       new PermissionsBubbleDialogDelegateView(this, requests, values);
 
   // 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));
 
   views::BubbleDialogDelegateView::CreateBubble(bubble_delegate_)->Show();
   bubble_delegate_->SizeToContents();
 
   bubble_delegate_->UpdateAnchor(GetAnchorView(),
                                  GetAnchorPoint(),
                                  GetAnchorArrow());
 }
 
-bool PermissionPromptImpl::CanAcceptRequestUpdate() {
-  return !(bubble_delegate_ && bubble_delegate_->IsMouseHovered());
+bool PermissionPromptImpl::MaybeCancelRequest() {
+  if (bubble_delegate_->IsMouseHovered())
+    return false;
+  Hide();
+  return true;
 }
 
 bool PermissionPromptImpl::HidesAutomatically() {
   return false;
 }
 
 void PermissionPromptImpl::Hide() {
   if (bubble_delegate_) {
     bubble_delegate_->CloseBubble();
     bubble_delegate_ = nullptr;
@@ skipping 46 matching lines @@
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 Profile* PermissionPromptImpl::GetProfile() {
   return browser_->profile();
 }