Revert "Revert 85330 - GTK: Bring global menu out of about:flags."

chrome/browser/ui/gtk/global_bookmark_menu.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/global_bookmark_menu.h"
 
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
@@ skipping 50 matching lines @@
   default_favicon_ = GtkThemeService::GetDefaultFavicon(true);
   default_folder_ = GtkThemeService::GetFolderIcon(true);
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  Source<Profile>(profile_));
 }
 
 GlobalBookmarkMenu::~GlobalBookmarkMenu() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
 }
 
-void GlobalBookmarkMenu::Init(GtkWidget* bookmark_menu) {
-  bookmark_menu_ = bookmark_menu;
+void GlobalBookmarkMenu::Init(GtkWidget* bookmark_menu,
+                              GtkWidget* bookmark_menu_item) {
+  bookmark_menu_.Own(bookmark_menu);
 
   EnsureMenuItemFunctions();
   if (gtk_menu_item_set_label_sym) {
     BookmarkModel* model = profile_->GetBookmarkModel();
     model->AddObserver(this);
     if (model->IsLoaded())
       Loaded(model);
   }
 }
 
 void GlobalBookmarkMenu::RebuildMenuInFuture() {
   method_factory_.RevokeAll();
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(&GlobalBookmarkMenu::RebuildMenu));
 }
 
 void GlobalBookmarkMenu::RebuildMenu() {
-
-
   BookmarkModel* model = profile_->GetBookmarkModel();
   DCHECK(model);
   DCHECK(model->IsLoaded());
 
   ClearBookmarkMenu();
 
   const BookmarkNode* bar_node = model->GetBookmarkBarNode();
   if (bar_node->child_count()) {
-    AddBookmarkMenuItem(bookmark_menu_, gtk_separator_menu_item_new());
-    AddNodeToMenu(bar_node, bookmark_menu_);
+    AddBookmarkMenuItem(bookmark_menu_.get(), gtk_separator_menu_item_new());
+    AddNodeToMenu(bar_node, bookmark_menu_.get());
   }
 
   // Only display the other bookmarks folder in the menu if it has items in it.
   const BookmarkNode* other_node = model->other_node();
   if (other_node->child_count()) {
     GtkWidget* submenu = gtk_menu_new();
     AddNodeToMenu(other_node, submenu);
 
-    AddBookmarkMenuItem(bookmark_menu_, gtk_separator_menu_item_new());
+    AddBookmarkMenuItem(bookmark_menu_.get(), gtk_separator_menu_item_new());
 
     GtkWidget* menu_item = gtk_image_menu_item_new_with_label(
         l10n_util::GetStringUTF8(IDS_BOOMARK_BAR_OTHER_FOLDER_NAME).c_str());
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
     gtk_image_menu_item_set_image(
         GTK_IMAGE_MENU_ITEM(menu_item),
         gtk_image_new_from_pixbuf(default_folder_));
 
-    AddBookmarkMenuItem(bookmark_menu_, menu_item);
+    AddBookmarkMenuItem(bookmark_menu_.get(), menu_item);
   }
 }
 
 void GlobalBookmarkMenu::AddBookmarkMenuItem(GtkWidget* menu,
                                              GtkWidget* menu_item) {
   g_object_set_data(G_OBJECT(menu_item), "type-tag",
                     GINT_TO_POINTER(GlobalMenuBar::TAG_BOOKMARK_CLEARABLE));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu_item);
   gtk_widget_show(menu_item);
 }
@@ skipping 67 matching lines @@
   std::map<const BookmarkNode*, GtkWidget*>::iterator it =
       bookmark_nodes_.find(node);
   if (it == bookmark_nodes_.end())
     return NULL;
   return it->second;
 }
 
 void GlobalBookmarkMenu::ClearBookmarkMenu() {
   bookmark_nodes_.clear();
 
-  gtk_container_foreach(GTK_CONTAINER(bookmark_menu_),
+  gtk_container_foreach(GTK_CONTAINER(bookmark_menu_.get()),
                         &ClearBookmarkItemCallback,
                         NULL);
 }
 
 // static
 void GlobalBookmarkMenu::ClearBookmarkItemCallback(GtkWidget* menu_item,
                                                    void* unused) {
   int tag = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item), "type-tag"));
   if (tag == GlobalMenuBar::TAG_BOOKMARK_CLEARABLE)
     gtk_widget_destroy(menu_item);
@@ skipping 68 matching lines @@
 void GlobalBookmarkMenu::OnBookmarkItemActivated(GtkWidget* menu_item) {
   // The actual mouse event that generated this activated event was in a
   // different process. Go with something default.
   const BookmarkNode* node = static_cast<const BookmarkNode*>(
       g_object_get_data(G_OBJECT(menu_item), "bookmark-node"));
 
   browser_->OpenURL(node->GetURL(), GURL(), NEW_FOREGROUND_TAB,
                     PageTransition::AUTO_BOOKMARK);
 }