GTK: Fix a couple minor popup window icon menu bugs.

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/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 159 matching lines @@
     if (menu_data->submenu) {
       GtkWidget* submenu = gtk_menu_new();
       BuildMenuIn(submenu, menu_data->submenu, accel_group);
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item), submenu);
     } else if (menu_data->custom_submenu) {
       gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
                                 menu_data->custom_submenu->menu_.get());
       submenus_we_own_.push_back(menu_data->custom_submenu);
     }
 
-    if ((menu_data->only_show || accel_group) && menu_data->accel_key) {
+    if (menu_data->accel_key) {
       // If we ever want to let the user do any key remaping, we'll need to
       // change the following so we make a gtk_accel_map which keeps the actual
       // keys.
       gtk_widget_add_accelerator(menu_item,
                                  "activate",
-                                 menu_data->only_show ? dummy_accel_group_ :
-                                                        accel_group,
+                                 menu_data->only_show || !accel_group ?
+                                     dummy_accel_group_ : accel_group,
                                  menu_data->accel_key,
                                  GdkModifierType(menu_data->accel_modifiers),
                                  GTK_ACCEL_VISIBLE);
     }
 
     g_object_set_data(G_OBJECT(menu_item), "menu-data",
                       const_cast<MenuCreateMaterial*>(menu_data));
 
     g_signal_connect(G_OBJECT(menu_item), "activate",
                      G_CALLBACK(OnMenuItemActivated), this);
@@ skipping 165 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);
     }
   }
 }