Add a method to the controller to close the picker/service tab when a return value is passed.

chrome/browser/ui/gtk/web_intent_picker_gtk.cc

 // Copyright (c) 2011 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/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
 #include "base/bind.h"
 #include "base/callback.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 74 matching lines @@
 WebIntentPickerGtk::WebIntentPickerGtk(Browser* browser,
                                        TabContentsWrapper* wrapper,
                                        WebIntentPickerDelegate* delegate)
     : wrapper_(wrapper),
       delegate_(delegate),
       contents_(NULL),
       button_hbox_(NULL),
       bubble_(NULL),
       browser_(browser) {
   DCHECK(delegate_ != NULL);
+  DCHECK(browser);
+  DCHECK(browser->window());
   BrowserWindowGtk* browser_window =
       BrowserWindowGtk::GetBrowserWindowForNativeWindow(
           browser->window()->GetNativeHandle());
 
   GtkWidget* anchor = browser_window->
       GetToolbar()->GetLocationBarView()->location_icon_widget();
 
   InitContents();
 
   BubbleGtk::ArrowLocationGtk arrow_location = base::i18n::IsRTL() ?
@@ skipping 53 matching lines @@
   GtkWidget* button = GetServiceButton(index);
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   GdkPixbuf* icon_pixbuf = rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON);
   SetServiceButtonImage(button, icon_pixbuf);
 }
 
 void WebIntentPickerGtk::Close() {
   bubble_->Close();
   bubble_ = NULL;
-
-  inline_disposition_tab_contents_.reset();
-  inline_disposition_delegate_.reset();
-  tab_contents_container_.reset();
+  if (inline_disposition_tab_contents_.get())
+    inline_disposition_tab_contents_->tab_contents()->OnCloseStarted();
 }
 
 void WebIntentPickerGtk::BubbleClosing(BubbleGtk* bubble,
                                        bool closed_by_escape) {
   delegate_->OnClosing();
 }
 
 void WebIntentPickerGtk::OnCloseButtonClick(GtkWidget* button) {
   delegate_->OnCancelled();
   delegate_->OnClosing();
@@ skipping 139 matching lines @@
     const TabContents* source) const {
   return true;
 }
 
 bool WebIntentPickerGtk::InlineDispositionDelegate::
 ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     content::NavigationType navigation_type) {
   return false;
 }