wip: Add ui::EventType parameter.

chrome/browser/ui/views/wrench_menu.cc

 // Copyright (c) 2012 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/ui/views/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 275 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ScheduleAllView);
 };
 
 string16 GetAccessibleNameForWrenchMenuItem(
       MenuModel* model, int item_index, int accessible_string_id) {
   string16 accessible_name = l10n_util::GetStringUTF16(accessible_string_id);
   string16 accelerator_text;
 
   ui::Accelerator menu_accelerator;
   if (model->GetAcceleratorAt(item_index, &menu_accelerator)) {
-    accelerator_text =
-        ui::Accelerator(menu_accelerator.key_code(),
-                        menu_accelerator.modifiers()).GetShortcutText();
+    accelerator_text = ui::Accelerator(menu_accelerator.key_code(),
+                                       menu_accelerator.modifiers(),
+                                       ui::ET_KEY_PRESSED).GetShortcutText();
   }
 
   return MenuItemView::GetAccessibleNameForMenuItem(
       accessible_name, accelerator_text);
 }
 
 // WrenchMenuView is a view that can contain text buttons.
 class WrenchMenuView : public ScheduleAllView, public views::ButtonListener {
  public:
   WrenchMenuView(WrenchMenu* menu, MenuModel* menu_model)
@@ skipping 498 matching lines @@
   if (command_id == IDC_CUT || command_id == IDC_ZOOM_MINUS) {
     // These have special child views; don't show the accelerator for them.
     return false;
   }
 
   ui::Accelerator menu_accelerator;
   if (!entry.first->GetAcceleratorAt(entry.second, &menu_accelerator))
     return false;
 
   *accelerator = ui::Accelerator(menu_accelerator.key_code(),
-                                 menu_accelerator.modifiers());
+                                 menu_accelerator.modifiers(),
+                                 ui::ET_KEY_PRESSED);
   return true;
 }
 
 void WrenchMenu::WillShowMenu(MenuItemView* menu) {
   if (menu == bookmark_menu_)
     CreateBookmarkMenu();
 }
 
 void WrenchMenu::WillHideMenu(MenuItemView* menu) {
   // Turns off the fade out animation of the wrench menus if
@@ skipping 132 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }