Fix for issue 27210, show bookmarks bar menu is out of sync with the browser's status.

views/controls/menu/native_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 "views/controls/menu/native_menu_gtk.h"
 
 #include <string>
 
 #include "app/gfx/gtk_util.h"
 #include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace {
-// Data passed to the UpdateStateCallback from gtk_container_foreach.
-struct UpdateStateData {
-  // The model to retrieve state from.
-  views::Menu2Model* model;
-  // The index within said model.
-  int index;
-};
+
+const char kPositionString[] = "position";
 
 // Data passed to the MenuPositionFunc from gtk_menu_popup
 struct Position {
   // The point to run the menu at.
   gfx::Point point;
   // The alignment of the menu at that point.
   views::Menu2::Alignment alignment;
 };
 
 std::string ConvertAcceleratorsFromWindowsStyle(const std::string& label) {
@@ skipping 25 matching lines @@
 }  // namespace
 
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuGtk, public:
 
 NativeMenuGtk::NativeMenuGtk(Menu2Model* model)
     : model_(model),
       menu_(NULL),
-      menu_shown_(false) {
+      menu_shown_(false),
+      suppress_activate_signal_(false) {
 }
 
 NativeMenuGtk::~NativeMenuGtk() {
   gtk_widget_destroy(menu_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuGtk, MenuWrapper implementation:
 
 void NativeMenuGtk::RunMenuAt(const gfx::Point& point, int alignment) {
+  UpdateStates();
   Position position = { point, static_cast<Menu2::Alignment>(alignment) };
   // TODO(beng): value of '1' will not work for context menus!
   gtk_menu_popup(GTK_MENU(menu_), NULL, NULL, MenuPositionFunc, &position, 1,
                  gtk_get_current_event_time());
 
   DCHECK(!menu_shown_);
   menu_shown_ = true;
   // Listen for "hide" signal so that we know when to return from the blocking
   // RunMenuAt call.
   gint handle_id =
@@ skipping 17 matching lines @@
   for (int i = 0; i < model_->GetItemCount(); ++i) {
     Menu2Model::ItemType type = model_->GetTypeAt(i);
     if (type == Menu2Model::TYPE_SEPARATOR)
       AddSeparatorAt(i);
     else
       AddMenuItemAt(i, &last_radio_item);
   }
 }
 
 void NativeMenuGtk::UpdateStates() {
-  UpdateStateData data = { model_, 0 };
-  gtk_container_foreach(GTK_CONTAINER(menu_), &UpdateStateCallback, &data);
+  gtk_container_foreach(GTK_CONTAINER(menu_), &UpdateStateCallback, this);
 }
 
 gfx::NativeMenu NativeMenuGtk::GetNativeMenu() const {
   return menu_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuGtk, private:
 
 // static
@@ skipping 57 matching lines @@
     Menu2* submenu = new Menu2(model_->GetSubmenuModelAt(index));
     g_object_set_data(G_OBJECT(menu_item), "submenu", submenu);
     gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
                               submenu->GetNativeMenu());
   }
 
   views::Accelerator accelerator(base::VKEY_UNKNOWN, false, false, false);
   if (model_->GetAcceleratorAt(index, &accelerator)) {
     // TODO(beng): accelerators w/gtk_widget_add_accelerator.
   }
-  g_object_set_data(G_OBJECT(menu_item), "position",
+  g_object_set_data(G_OBJECT(menu_item), kPositionString,
                              reinterpret_cast<void*>(index));
   g_signal_connect(G_OBJECT(menu_item), "activate", G_CALLBACK(CallActivate),
                    this);
   gtk_widget_show(menu_item);
   gtk_menu_append(menu_, menu_item);
 }
 
-// static
-void NativeMenuGtk::UpdateStateCallback(GtkWidget* menu_item, gpointer data) {
-  UpdateStateData* usd = reinterpret_cast<UpdateStateData*>(data);
-  gtk_widget_set_sensitive(menu_item, usd->model->IsEnabledAt(usd->index));
+void NativeMenuGtk::ResetMenu() {
+  if (menu_)
+    gtk_widget_destroy(menu_);
+  menu_ = gtk_menu_new();
+}
+
+void NativeMenuGtk::UpdateMenuItemState(GtkWidget* menu_item) {
+  int index = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item),
+                                                kPositionString));
+
+  gtk_widget_set_sensitive(menu_item, model_->IsEnabledAt(index));
   if (GTK_IS_CHECK_MENU_ITEM(menu_item)) {
+    suppress_activate_signal_ = true;
     gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_item),
-                                   usd->model->IsItemCheckedAt(usd->index));
+                                   model_->IsItemCheckedAt(index));
+    suppress_activate_signal_ = false;
   }
   // Recurse into submenus, too.
   if (GTK_IS_MENU_ITEM(menu_item)) {
     if (gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item))) {
       Menu2* submenu =
           reinterpret_cast<Menu2*>(g_object_get_data(G_OBJECT(menu_item),
                                    "submenu"));
       if (submenu)
         submenu->UpdateStates();
     }
   }
-  ++usd->index;
-}
-
-void NativeMenuGtk::ResetMenu() {
-  if (menu_)
-    gtk_widget_destroy(menu_);
-  menu_ = gtk_menu_new();
 }
 
 // static
+void NativeMenuGtk::UpdateStateCallback(GtkWidget* menu_item, gpointer data) {
+  NativeMenuGtk* menu = reinterpret_cast<NativeMenuGtk*>(data);
+  menu->UpdateMenuItemState(menu_item);
+}
+
+// static
 void NativeMenuGtk::MenuPositionFunc(GtkMenu* menu,
                                      int* x,
                                      int* y,
                                      gboolean* push_in,
                                      void* data) {
   Position* position = reinterpret_cast<Position*>(data);
   // TODO(beng): RTL
   *x = position->point.x();
   *y = position->point.y();
   if (position->alignment == Menu2::ALIGN_TOPRIGHT) {
     GtkRequisition menu_req;
     gtk_widget_size_request(GTK_WIDGET(menu), &menu_req);
     *x -= menu_req.width;
   }
   *push_in = FALSE;
 }
 
 void NativeMenuGtk::OnActivate(GtkMenuItem* menu_item) {
+  if (suppress_activate_signal_)
+    return;
   int position = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menu_item),
-                                                   "position"));
+                                                   kPositionString));
   if (model_->IsEnabledAt(position) &&
       MenuTypeCanExecute(model_->GetTypeAt(position))) {
     model_->ActivatedAt(position);
   }
 }
 
 // static
 void NativeMenuGtk::CallActivate(GtkMenuItem* menu_item,
                                  NativeMenuGtk* native_menu) {
   native_menu->OnActivate(menu_item);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu->model());
 }
 
 }  // namespace views