[Linux Views] Refactor accelerator handler related code.

views/focus/accelerator_handler_gtk_unittest.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 <gdk/gdkkeysyms.h>
 
 #include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/view.h"
@@ skipping 81 matching lines @@
 
 // Test that the homepage accelerator (Alt+Home) is activated on key down
 // and that the menu accelerator (Alt) is never activated.
 TEST_F(AcceleratorHandlerGtkTest, TestHomepageAccelerator) {
   AcceleratorHandler handler;
   GdkEventKey evt;
 
   ASSERT_FALSE(menu_pressed_);
   ASSERT_FALSE(home_pressed_);
 
-  evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Menu, 0);
+  evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Alt_L, 0);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_FALSE(menu_pressed_);
   ASSERT_FALSE(home_pressed_);
 
   evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Home, GDK_MOD1_MASK);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_FALSE(menu_pressed_);
   ASSERT_TRUE(home_pressed_);
 
   evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Home, GDK_MOD1_MASK);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
-  evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Menu, 0);
+  evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_FALSE(menu_pressed_);
   ASSERT_TRUE(home_pressed_);
 }
 
 // Test that the menu accelerator is activated on key up and not key down.
 TEST_F(AcceleratorHandlerGtkTest, TestMenuAccelerator) {
   AcceleratorHandler handler;
   GdkEventKey evt;
 
   ASSERT_FALSE(menu_pressed_);
 
-  evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Menu, 0);
+  evt = CreateKeyEvent(GDK_KEY_PRESS, GDK_Alt_L, 0);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_FALSE(menu_pressed_);
 
-  evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Menu, 0);
+  evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_TRUE(menu_pressed_);
 }
 
 // Test that the menu accelerator isn't confused by the interaction of the
 // Alt and Shift keys. Try the following sequence on Linux:
 //   Press Alt
 //   Press Shift
 //   Release Alt
@@ skipping 38 matching lines @@
 
   // Release Alt - now this should trigger the menu shortcut.
   evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   evt.hardware_keycode = 0x40;
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_TRUE(menu_pressed_);
 }
 
 }  // namespace views