Make avatar menu bubble as singleton and destroy all the menu items and menu model when bubble cl...

chrome/browser/ui/gtk/avatar_menu_item_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/avatar_menu_item_gtk.h"
 
+#include "base/bind.h"
+#include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 16 matching lines @@
 }  // namespace
 
 AvatarMenuItemGtk::AvatarMenuItemGtk(Delegate* delegate,
                                      const AvatarMenuModel::Item& item,
                                      size_t item_index,
                                      GtkThemeService* theme_service)
     : delegate_(delegate),
       item_(item),
       item_index_(item_index),
       status_label_(NULL),
-      link_alignment_(NULL) {
+      link_alignment_(NULL),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
   Init(theme_service);
 }
 
 AvatarMenuItemGtk::~AvatarMenuItemGtk() {
+  widget_.Destroy();
+}
+
+void AvatarMenuItemGtk::OpenProfile() {
+  delegate_->OpenProfile(item_index_);
 }
 
 gboolean AvatarMenuItemGtk::OnProfileClick(GtkWidget* widget,
                                            GdkEventButton* event) {
-  delegate_->OpenProfile(item_index_);
+  // delegate_->EditProfile() will close the avatar bubble which in turn
+  // try to destroy this AvatarMenuItemGtk.
+  // This is not OK to do this from the signal handler, so we'll
+  // defer it.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&AvatarMenuItemGtk::OpenProfile,
+                 weak_factory_.GetWeakPtr()));
   return FALSE;
 }
 
 gboolean AvatarMenuItemGtk::OnProfileEnter(GtkWidget* widget,
                                            GdkEventCrossing* event) {
   if (event->detail == GDK_NOTIFY_INFERIOR)
     return FALSE;
 
   GtkStyle* style = gtk_rc_get_style(widget);
   GdkColor highlight_color = style->bg[GTK_STATE_SELECTED];
@@ skipping 13 matching lines @@
 
   gtk_widget_modify_bg(widget, GTK_STATE_NORMAL, NULL);
   if (item_.active) {
     gtk_widget_show(status_label_);
     gtk_widget_hide(link_alignment_);
   }
 
   return FALSE;
 }
 
+void AvatarMenuItemGtk::EditProfile() {
+  delegate_->EditProfile(item_index_);
+}
+
 void AvatarMenuItemGtk::OnEditProfileLinkClicked(GtkWidget* link) {
-  delegate_->EditProfile(item_index_);
+  // delegate_->EditProfile() will close the avatar bubble which in turn
+  // try to destroy this AvatarMenuItemGtk.
+  // This is not OK to do this from the signal handler, so we'll
+  // defer it.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      base::Bind(&AvatarMenuItemGtk::EditProfile,
+                 weak_factory_.GetWeakPtr()));
 }
 
 void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
   widget_.Own(gtk_event_box_new());
 
   g_signal_connect(widget_.get(), "button-press-event",
       G_CALLBACK(OnProfileClickThunk), this);
   g_signal_connect(widget_.get(), "enter-notify-event",
       G_CALLBACK(OnProfileEnterThunk), this);
   g_signal_connect(widget_.get(), "leave-notify-event",
@@ skipping 77 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }