Views: fix a crash where in the browser actions container....

views/controls/menu/native_menu_gtk.cc

 // Copyright (c) 2010 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 <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 94 matching lines @@
   DCHECK(!menu_shown_);
   menu_shown_ = true;
 
   for (unsigned int i = 0; i < listeners_.size(); ++i) {
     listeners_[i]->OnMenuOpened();
   }
 
   // Listen for "hide" signal so that we know when to return from the blocking
   // RunMenuAt call.
   gint hide_handle_id =
-      g_signal_connect(menu_, "hide", G_CALLBACK(OnMenuHidden), this);
+      g_signal_connect(menu_, "hide", G_CALLBACK(OnMenuHiddenThunk), this);
 
   gint move_handle_id =
-      g_signal_connect(menu_, "move-current", G_CALLBACK(OnMenuMoveCurrent),
-                       this);
+      g_signal_connect(menu_, "move-current",
+                       G_CALLBACK(OnMenuMoveCurrentThunk), this);
 
   // Block until menu is no longer shown by running a nested message loop.
   MessageLoopForUI::current()->Run(NULL);
 
   g_signal_handler_disconnect(G_OBJECT(menu_), hide_handle_id);
   g_signal_handler_disconnect(G_OBJECT(menu_), move_handle_id);
   menu_shown_ = false;
 
   if (activated_menu_) {
     MessageLoop::current()->PostTask(FROM_HERE,
                                      activate_factory_.NewRunnableMethod(
                                          &NativeMenuGtk::ProcessActivate));
   }
 }
 
 void NativeMenuGtk::CancelMenu() {
-  NOTIMPLEMENTED();
+  gtk_widget_hide(menu_);
 }
 
 void NativeMenuGtk::Rebuild() {
   activated_menu_ = NULL;
 
   ResetMenu();
 
   // Try to retrieve accelerator group as data from menu_; if null, create new
   // one and store it as data into menu_.
   // We store it as data so as to use the destroy notifier to get rid of initial
@@ skipping 54 matching lines @@
       if (*iter == listener) {
         listeners_.erase(iter);
         return;
       }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeMenuGtk, private:
 
-// static
-void NativeMenuGtk::OnMenuHidden(GtkWidget* widget, NativeMenuGtk* menu) {
-  if (!menu->menu_shown_) {
+void NativeMenuGtk::OnMenuHidden(GtkWidget* widget) {
+  if (!menu_shown_) {
     // This indicates we don't have a menu open, and should never happen.
     NOTREACHED();
     return;
   }
   // Quit the nested message loop we spawned in RunMenuAt.
   MessageLoop::current()->Quit();
 }
 
-// static
-void NativeMenuGtk::OnMenuMoveCurrent(GtkMenu* menu_widget,
-                                      GtkMenuDirectionType focus_direction,
-                                      NativeMenuGtk* menu) {
+void NativeMenuGtk::OnMenuMoveCurrent(GtkWidget* menu_widget,
+                                      GtkMenuDirectionType focus_direction) {
   GtkWidget* parent = GTK_MENU_SHELL(menu_widget)->parent_menu_shell;
   GtkWidget* menu_item = GTK_MENU_SHELL(menu_widget)->active_menu_item;
   GtkWidget* submenu = NULL;
   if (menu_item) {
     submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
   }
 
   if (focus_direction == GTK_MENU_DIR_CHILD && submenu == NULL) {
-    menu->GetAncestor()->menu_action_ = MENU_ACTION_NEXT;
-    gtk_menu_popdown(menu_widget);
+    GetAncestor()->menu_action_ = MENU_ACTION_NEXT;
+    gtk_menu_popdown(GTK_MENU(menu_widget));
   } else if (focus_direction == GTK_MENU_DIR_PARENT && parent == NULL) {
-    menu->GetAncestor()->menu_action_ = MENU_ACTION_PREVIOUS;
-    gtk_menu_popdown(menu_widget);
+    GetAncestor()->menu_action_ = MENU_ACTION_PREVIOUS;
+    gtk_menu_popdown(GTK_MENU(menu_widget));
   }
 }
 
 void NativeMenuGtk::AddSeparatorAt(int index) {
   GtkWidget* separator = gtk_separator_menu_item_new();
   gtk_widget_show(separator);
   gtk_menu_append(menu_, separator);
 }
 
 GtkWidget* NativeMenuGtk::AddMenuItemAt(int index,
@@ skipping 217 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu);
 }
 
 }  // namespace views