[Mac] Address buggy permission bubble behaviour on dismissal via ESC.

chrome/browser/ui/views/website_settings/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/website_settings/permission_prompt_impl.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 376 matching lines @@
   // The anchor rect is ignored unless |anchor_view| is nullptr.
   SetAnchorRect(gfx::Rect(anchor_point, gfx::Size()));
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // PermissionPromptImpl
 
 PermissionPromptImpl::PermissionPromptImpl(Browser* browser)
     : browser_(browser),
       delegate_(nullptr),
-      bubble_delegate_(nullptr) {
-  DCHECK(browser);
-  DCHECK(browser->window());
-}
+      bubble_delegate_(nullptr) {}

[hcarmona, 2016/10/10 18:08:19]

Same here.

[dominickn, 2016/10/10 22:55:48]

See other comment

 
 PermissionPromptImpl::~PermissionPromptImpl() {
 }
 
 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();
 
   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()));
 
@@ skipping 14 matching lines @@
     bubble_delegate_->CloseBubble();
     bubble_delegate_ = nullptr;
   }
 }
 
 bool PermissionPromptImpl::IsVisible() {
   return bubble_delegate_ != nullptr;
 }
 
 void PermissionPromptImpl::UpdateAnchorPosition() {
+  DCHECK(browser_);
+  DCHECK(browser_->window());
+
   if (IsVisible()) {
     bubble_delegate_->set_parent_window(
         platform_util::GetViewForWindow(browser_->window()->GetNativeWindow()));
     bubble_delegate_->UpdateAnchor(GetAnchorView(),
                                    GetAnchorPoint(),
                                    GetAnchorArrow());
   }
 }
 
 gfx::NativeWindow PermissionPromptImpl::GetNativeWindow() {
@@ skipping 21 matching lines @@
 
 void PermissionPromptImpl::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionPromptImpl::Deny() {
   if (delegate_)
     delegate_->Deny();
 }