Merge 37725 - GTK: Make page and app menus shortcut control flow match window...

chrome/browser/gtk/accelerators_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 "chrome/browser/gtk/accelerators_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 144 matching lines @@
   { GDK_Delete, IDC_CLEAR_BROWSING_DATA,
     GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
   { GDK_h, IDC_SHOW_HISTORY, GDK_CONTROL_MASK },
   { GDK_j, IDC_SHOW_DOWNLOADS, GDK_CONTROL_MASK },
   { GDK_F1, IDC_HELP_PAGE, GdkModifierType(0) },
   { XF86XK_AddFavorite, IDC_BOOKMARK_PAGE, GdkModifierType(0) },
   { XF86XK_Favorites, IDC_SHOW_BOOKMARK_BAR, GdkModifierType(0) },
   { XF86XK_History, IDC_SHOW_HISTORY, GdkModifierType(0) },
   { GDK_q, IDC_EXIT, GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
   { GDK_s, IDC_SAVE_PAGE, GDK_CONTROL_MASK },
+  { GDK_e, IDC_SHOW_PAGE_MENU, GDK_MOD1_MASK },
+  { GDK_f, IDC_SHOW_APP_MENU, GDK_MOD1_MASK },
 };
 
 }  // namespace
 
 AcceleratorsGtk::AcceleratorsGtk() {
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     int command_id = kAcceleratorMap[i].command_id;
     menus::AcceleratorGtk accelerator(kAcceleratorMap[i].keyval,
                                       kAcceleratorMap[i].modifier_type);
     all_accelerators_.push_back(
         std::pair<int, menus::AcceleratorGtk>(command_id, accelerator));
 
     if (primary_accelerators_.find(command_id) ==
         primary_accelerators_.end()) {
       primary_accelerators_[command_id] = accelerator;
     }
   }
 }
 
 const menus::AcceleratorGtk* AcceleratorsGtk::GetPrimaryAcceleratorForCommand(
     int command_id) {
   base::hash_map<int, menus::AcceleratorGtk>::const_iterator iter =
       primary_accelerators_.find(command_id);
 
   if (iter == primary_accelerators_.end())
     return NULL;
 
   return &iter->second;
 }