Revert of [WebsiteSettings] Set view to null on manager to ensure no stale access.

chrome/browser/ui/views/website_settings/permissions_bubble_view.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/permissions_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_request.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 11 matching lines @@
                                       public views::ButtonListener {
  public:
   explicit PermissionsBubbleDelegateView(
       views::View* anchor,
       PermissionBubbleViewViews* owner,
       const std::vector<PermissionBubbleRequest*>& requests,
       const std::vector<bool>& accept_state,
       bool customization_mode);
   virtual ~PermissionsBubbleDelegateView();
 
-  void Close();
+  void ResetOwner();
   void SizeToContents();
 
   // BubbleDelegateView:
   virtual bool ShouldShowCloseButton() const OVERRIDE;
   virtual bool ShouldShowWindowTitle() const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
 
   // ButtonListener:
   virtual void ButtonPressed(views::Button* button,
@@ skipping 128 matching lines @@
   allow_ = allow_button;
 
   button_layout->AddPaddingRow(0, 30);
 }
 
 PermissionsBubbleDelegateView::~PermissionsBubbleDelegateView() {
   if (owner_)
     owner_->Closing();
 }
 
-void PermissionsBubbleDelegateView::Close() {
+void PermissionsBubbleDelegateView::ResetOwner() {
   owner_ = NULL;
-  GetWidget()->Close();
 }
 
 bool PermissionsBubbleDelegateView::ShouldShowCloseButton() const {
   return true;
 }
 
 bool PermissionsBubbleDelegateView::ShouldShowWindowTitle() const {
   return true;
 }
 
@@ skipping 28 matching lines @@
     owner_->Deny();
   else if (button == customize_)
     owner_->SetCustomizationMode();
 }
 
 PermissionBubbleViewViews::PermissionBubbleViewViews(views::View* anchor_view)
     : anchor_view_(anchor_view),
       delegate_(NULL),
       bubble_delegate_(NULL) {}
 
-PermissionBubbleViewViews::~PermissionBubbleViewViews() {
-  if (delegate_)
-    delegate_->SetView(NULL);
-}
+PermissionBubbleViewViews::~PermissionBubbleViewViews() {}
 
 void PermissionBubbleViewViews::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionBubbleViewViews::Show(
     const std::vector<PermissionBubbleRequest*>& requests,
     const std::vector<bool>& values,
     bool customization_mode) {
-  if (bubble_delegate_ != NULL)
-    bubble_delegate_->Close();
+  if (bubble_delegate_ != NULL) {
+    bubble_delegate_->ResetOwner();
+    bubble_delegate_->StartFade(false);
+  }
 
   PermissionsBubbleDelegateView* bubble_delegate =
       new PermissionsBubbleDelegateView(anchor_view_, this,
                                         requests, values, customization_mode);
   bubble_delegate_ = bubble_delegate;
   views::BubbleDelegateView::CreateBubble(bubble_delegate_);
 
   bubble_delegate_->StartFade(true);
   bubble_delegate->SizeToContents();
 }
 
 void PermissionBubbleViewViews::Hide() {
   if (bubble_delegate_) {
-    bubble_delegate_->Close();
-    bubble_delegate_ = NULL;
+    bubble_delegate_->ResetOwner();
+    bubble_delegate_->StartFade(false);
   }
 }
 
 void PermissionBubbleViewViews::Closing() {
   if (bubble_delegate_)
     bubble_delegate_ = NULL;
   if (delegate_)
     delegate_->Closing();
 }
 
 void PermissionBubbleViewViews::Toggle(int index, bool value) {
   if (delegate_)
     delegate_->ToggleAccept(index, value);
 }
 
 void PermissionBubbleViewViews::Accept() {
   if (delegate_)
     delegate_->Accept();
 }
 
 void PermissionBubbleViewViews::Deny() {
   if (delegate_)
     delegate_->Deny();
 }
 
 void PermissionBubbleViewViews::SetCustomizationMode() {
   if (delegate_)
     delegate_->SetCustomizationMode();
 }