[Web Intents, Mac] Allow re-open after cancellation/close of picker bubble

chrome/browser/ui/cocoa/web_intent_picker_cocoa.mm

 // Copyright (c) 2012 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/cocoa/web_intent_picker_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 57 matching lines @@
                                        parentWindow:parentWindow
                                          anchoredAt:anchor];
 }
 
 WebIntentPickerCocoa::~WebIntentPickerCocoa() {
   if (model_ != NULL)
     model_->set_observer(NULL);
 }
 
 void WebIntentPickerCocoa::Close() {
+  DCHECK(controller_);
+  [controller_ close];
+  if (inline_disposition_tab_contents_.get())
+    inline_disposition_tab_contents_->web_contents()->OnCloseStarted();
 }
 
 void WebIntentPickerCocoa::PerformDelayedLayout() {
   // Check to see if a layout has already been scheduled.
   if (weak_ptr_factory_.HasWeakPtrs())
     return;
 
   // Delay performing layout by a second so that all the animations from
   // InfoBubbleWindow and origin updates from BaseBubbleController finish, so
   // that we don't all race trying to change the frame's origin.
@@ skipping 47 matching lines @@
   [controller_ setInlineDispositionTabContents:
       inline_disposition_tab_contents_.get()];
   PerformDelayedLayout();
 
   delegate_->OnInlineDispositionWebContentsCreated(web_contents);
 }
 
 void WebIntentPickerCocoa::OnCancelled() {
   DCHECK(delegate_);
   delegate_->OnCancelled();
-  controller_ = NULL;  // Controller will be unusable soon, abandon.
+  delegate_->OnClosing();
+  MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void WebIntentPickerCocoa::OnServiceChosen(size_t index) {
   DCHECK(delegate_);
   const WebIntentPickerModel::Item& item = model_->GetItemAt(index);
   delegate_->OnServiceChosen(index, item.disposition);
 }
 
 void WebIntentPickerCocoa::set_controller(
     WebIntentBubbleController* controller) {
   controller_ = controller;
 }