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

chrome/browser/ui/gtk/avatar_menu_bubble_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_bubble_gtk.h"
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 36 matching lines @@
   OnAvatarMenuModelChanged(avatar_menu_model_.get());
 
   bubble_ = BubbleGtk::Show(anchor,
                             rect,
                             contents_,
                             arrow,
                             true,  // |match_system_theme|
                             true,  // |grab_input|
                             theme_service_,
                             this);  // |delegate|
+  g_signal_connect(contents_, "destroy",
+                   G_CALLBACK(&OnDestroyThunk), this);
 }
 
 AvatarMenuBubbleGtk::~AvatarMenuBubbleGtk() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
 }
 
+void AvatarMenuBubbleGtk::OnDestroy(GtkWidget* widget) {
+  // We are self deleting, we have a destroy signal setup to catch when we
+  // destroyed (via the BubbleGtk being destroyed), and delete ourself.
+  delete this;
+}
+
 void AvatarMenuBubbleGtk::BubbleClosing(BubbleGtk* bubble,
                                         bool closed_by_escape) {
 }
 
 void AvatarMenuBubbleGtk::OnAvatarMenuModelChanged(
     AvatarMenuModel* avatar_menu_model) {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
   minimum_width_ = kBubbleMinWidth;
 
@@ skipping 53 matching lines @@
   g_signal_connect(new_profile_link, "clicked",
                    G_CALLBACK(OnNewProfileLinkClickedThunk), this);
 
   GtkWidget* link_align = gtk_alignment_new(0, 0, 0, 0);
   gtk_alignment_set_padding(GTK_ALIGNMENT(link_align),
                             0, 0, kNewProfileLinkLeftPadding, 0);
   gtk_container_add(GTK_CONTAINER(link_align), new_profile_link);
 
   gtk_box_pack_start(GTK_BOX(contents_), link_align, FALSE, FALSE, 0);
 }