Refactor bookmark clipboard code to be cross platform.

chrome/browser/gtk/menu_gtk.cc

 // Copyright (c) 2009 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/gtk/menu_gtk.h"
 
 #include "app/l10n_util.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
+#include "base/message_loop.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/common/gtk_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 using gtk_util::ConvertAcceleratorsFromWindowsStyle;
 
 bool MenuGtk::block_activation_ = false;
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  const MenuCreateMaterial* menu_data,
                  GtkAccelGroup* accel_group)
     : delegate_(delegate),
       dummy_accel_group_(gtk_accel_group_new()),
-      menu_(gtk_menu_new()) {
+      menu_(gtk_menu_new()),
+      factory_(this) {
   ConnectSignalHandlers();
   BuildMenuIn(menu_.get(), menu_data, accel_group);
 }
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, bool load)
     : delegate_(delegate),
       dummy_accel_group_(NULL),
-      menu_(gtk_menu_new()) {
+      menu_(gtk_menu_new()),
+      factory_(this) {
   ConnectSignalHandlers();
   if (load)
     BuildMenuFromDelegate();
 }
 
 MenuGtk::~MenuGtk() {
   menu_.Destroy();
   if (dummy_accel_group_)
     g_object_unref(dummy_accel_group_);
 }
 
 void MenuGtk::ConnectSignalHandlers() {
+  // We connect afterwards because OnMenuShow calls SetMenuItemInfo, which may
+  // take a long time or even start a nested message loop.
   g_signal_connect(menu_.get(), "show", G_CALLBACK(OnMenuShow), this);
   g_signal_connect(menu_.get(), "hide", G_CALLBACK(OnMenuHidden), this);
 }
 
 void MenuGtk::AppendMenuItemWithLabel(int command_id,
                                       const std::string& label) {
   std::string converted_label = ConvertAcceleratorsFromWindowsStyle(label);
   GtkWidget* menu_item =
       gtk_menu_item_new_with_mnemonic(converted_label.c_str());
   AppendMenuItem(command_id, menu_item);
@@ skipping 230 matching lines @@
 
   if (!start_align)
     *x += widget->allocation.width - menu_req.width;
 
   if (*y + menu_req.height >= screen_rect.height)
     *y -= menu_req.height;
 
   *push_in = FALSE;
 }
 
+void MenuGtk::UpdateMenu() {
+  gtk_container_foreach(GTK_CONTAINER(menu_.get()), SetMenuItemInfo, this);
+}
+
 // static
 void MenuGtk::OnMenuShow(GtkWidget* widget, MenuGtk* menu) {
-  gtk_container_foreach(GTK_CONTAINER(menu->menu_.get()),
-                        SetMenuItemInfo, menu);
+  MessageLoop::current()->PostTask(FROM_HERE,
+      menu->factory_.NewRunnableMethod(&MenuGtk::UpdateMenu));
 }
 
 // static
 void MenuGtk::OnMenuHidden(GtkWidget* widget, MenuGtk* menu) {
   menu->delegate_->StoppedShowing();
 }
 
 // static
 void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {
   if (GTK_IS_SEPARATOR_MENU_ITEM(widget)) {
@@ skipping 36 matching lines @@
     gtk_widget_set_sensitive(
         widget, menu->delegate_->IsCommandEnabled(id));
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }