Disable delegation to picker controller once it is deleted.

chrome/browser/ui/gtk/web_intent_picker_gtk.cc

 // 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/gtk/web_intent_picker_gtk.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 269 matching lines @@
 }
 
 void WebIntentPickerGtk::OnExtensionIconChanged(
     WebIntentPickerModel* model,
     const std::string& extension_id) {
   UpdateSuggestedExtensions();
 }
 
 void WebIntentPickerGtk::OnInlineDisposition(const string16& title,
                                              const GURL& url) {
+  DCHECK(delegate_);
   content::WebContents* web_contents =
       delegate_->CreateWebContentsForInlineDisposition(
           tab_contents_->profile(), url);
   inline_disposition_tab_contents_.reset(
       TabContents::Factory::CreateTabContents(web_contents));
   Browser* browser = browser::FindBrowserWithWebContents(
       tab_contents_->web_contents());
   inline_disposition_delegate_.reset(
       new WebIntentInlineDispositionDelegate(this, web_contents, browser));
 
@@ skipping 107 matching lines @@
   gtk_misc_set_alignment(GTK_MISC(no_service_label), 0, 0);
   // Set the label width to the size of |sub_contents|, which we don't have
   // access to yet, by calculating the main content width minus borders.
   gtk_util::SetLabelWidth(no_service_label,
                           kWindowMinWidth - 2 * ui::kContentAreaBorder);
   gtk_box_pack_start(GTK_BOX(hbox), no_service_label, TRUE, TRUE, 0);
 
   gtk_widget_show_all(contents_);
 }
 
+void WebIntentPickerGtk::InvalidateDelegate() {
+  delegate_ = NULL;
+}
+
 GtkWidget* WebIntentPickerGtk::GetWidgetRoot() {
   return contents_;
 }
 
 GtkWidget* WebIntentPickerGtk::GetFocusWidget() {
   return contents_;
 }
 
 void WebIntentPickerGtk::DeleteDelegate() {
   // The delegate is deleted when the contents widget is destroyed. See
   // OnDestroy.
-  delegate_->OnClosing();
+  if (delegate_)
+    delegate_->OnClosing();
 }
 
 bool WebIntentPickerGtk::ShouldHaveBorderPadding() const {
   return false;
 }
 
 void WebIntentPickerGtk::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
@@ skipping 10 matching lines @@
 
 void WebIntentPickerGtk::OnDestroy(GtkWidget* button) {
   // Destroy this object when the contents widget is destroyed. It can't be
   // "delete this" because this function happens in a callback.
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
   model_->set_observer(NULL);
   window_ = NULL;
 }
 
 void WebIntentPickerGtk::OnCloseButtonClick(GtkWidget* button) {
+  DCHECK(delegate_);
   delegate_->OnUserCancelledPickerDialog();
 }
 
 void WebIntentPickerGtk::OnExtensionLinkClick(GtkWidget* link) {
+  DCHECK(delegate_);
   size_t index = GetExtensionWidgetRow(link);
   const WebIntentPickerModel::SuggestedExtension& extension =
       model_->GetSuggestedExtensionAt(index);
   delegate_->OnExtensionLinkClicked(extension.id,
       event_utils::DispositionForCurrentButtonPressEvent());
 }
 
 void WebIntentPickerGtk::OnExtensionInstallButtonClick(GtkWidget* button) {
+  DCHECK(delegate_);
   size_t index = GetExtensionWidgetRow(button);
   const WebIntentPickerModel::SuggestedExtension& extension =
       model_->GetSuggestedExtensionAt(index);
 
   delegate_->OnExtensionInstallRequested(extension.id);
   SetWidgetsEnabled(false);
 
   // Re-enable the clicked extension row.
   GList* vbox_list =
       gtk_container_get_children(GTK_CONTAINER(extensions_vbox_));
@@ skipping 10 matching lines @@
   g_list_free(hbox_list);
   g_list_free(vbox_list);
 
   // Show the throbber with the same size as the install button.
   GtkWidget* throbber = AddThrobberToExtensionAt(index);
   gtk_widget_set_size_request(throbber, allocation.width, allocation.height);
   gtk_widget_show_all(throbber);
 }
 
 void WebIntentPickerGtk::OnMoreSuggestionsLinkClick(GtkWidget* link) {
-  // TODO(binji): This should link to a CWS search, based on the current
-  // action/type pair.
+  DCHECK(delegate_);
   delegate_->OnSuggestionsLinkClicked(
       event_utils::DispositionForCurrentButtonPressEvent());
 }
 
 void WebIntentPickerGtk::OnChooseAnotherServiceClick(GtkWidget* link) {
+  DCHECK(delegate_);
   delegate_->OnChooseAnotherService();
   ResetContents();
 }
 
 void WebIntentPickerGtk::OnServiceButtonClick(GtkWidget* button) {
+  DCHECK(delegate_);
   GList* button_list = gtk_container_get_children(GTK_CONTAINER(button_vbox_));
   gint index = g_list_index(button_list, button);
   DCHECK(index != -1);
   g_list_free(button_list);
 
   const WebIntentPickerModel::InstalledService& installed_service =
       model_->GetInstalledServiceAt(index);
 
   delegate_->OnServiceChosen(installed_service.url,
                              installed_service.disposition,
@@ skipping 293 matching lines @@
   return alignment;
 }
 
 void WebIntentPickerGtk::RemoveThrobber() {
   GtkWidget* alignment = gtk_widget_get_parent(throbber_->widget());
   DCHECK(alignment);
   gtk_container_remove(GTK_CONTAINER(alignment), throbber_->widget());
   gtk_widget_destroy(alignment);
   throbber_->Stop();
 }