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

chrome/browser/gtk/browser_window_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/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <string>
 
@@ skipping 900 matching lines @@
 }
 
 void BrowserWindowGtk::ShowPageInfo(Profile* profile,
                                     const GURL& url,
                                     const NavigationEntry::SSLStatus& ssl,
                                     bool show_history) {
   browser::ShowPageInfo(window_, profile, url, ssl, show_history);
 }
 
 void BrowserWindowGtk::ShowPageMenu() {
-  // On Windows, this is used to show the page menu for a keyboard accelerator
-  // (Alt+e).  We connect the accelerator directly to the widget in
-  // BrowserToolbarGtk.
+  toolbar_->ShowPageMenu();
 }
 
 void BrowserWindowGtk::ShowAppMenu() {
-  // On Windows, this is used to show the page menu for a keyboard accelerator
-  // (Alt+f).  We connect the accelerator directly to the widget in
-  // BrowserToolbarGtk.
+  toolbar_->ShowAppMenu();
 }
 
 bool BrowserWindowGtk::PreHandleKeyboardEvent(
     const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) {
   GdkEventKey* os_event = event.os_event;
 
   if (!os_event || event.type != WebKit::WebInputEvent::RawKeyDown)
     return false;
 
   // We first find out the browser command associated to the |event|.
@@ skipping 1096 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "KWin" ||
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }