wip: Add ui::EventType parameter.

chrome/browser/ui/views/toolbar_view.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/toolbar_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 474 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, ui::AcceleratorProvider implementation:
 
 bool ToolbarView::GetAcceleratorForCommandId(int command_id,
     ui::Accelerator* accelerator) {
   // The standard Ctrl-X, Ctrl-V and Ctrl-C are not defined as accelerators
   // anywhere so we need to check for them explicitly here.
   // TODO(cpu) Bug 1109102. Query WebKit land for the actual bindings.
   switch (command_id) {
     case IDC_CUT:
-      *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN);
+      *accelerator = ui::Accelerator(ui::VKEY_X,
+                                     ui::EF_CONTROL_DOWN,
+                                     ui::ET_KEY_PRESSED);
       return true;
     case IDC_COPY:
-      *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
+      *accelerator = ui::Accelerator(ui::VKEY_C,
+                                     ui::EF_CONTROL_DOWN,
+                                     ui::ET_KEY_PRESSED);
       return true;
     case IDC_PASTE:
-      *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
+      *accelerator = ui::Accelerator(ui::VKEY_V,
+                                     ui::EF_CONTROL_DOWN,
+                                     ui::ET_KEY_PRESSED);
       return true;
 #if defined(USE_ASH)
     // When USE_ASH is defined, IDC_NEW_WINDOW and IDC_NEW_INCOGNITO_WINDOW are
     // handled outside Chrome, in ash/accelerators/accelerator_table.cc.
     // crbug.com/120196
     case IDC_NEW_WINDOW:
-      *accelerator = ui::Accelerator(ui::VKEY_N, ui::EF_CONTROL_DOWN);
+      *accelerator = ui::Accelerator(ui::VKEY_N,
+                                     ui::EF_CONTROL_DOWN,
+                                     ui::ET_KEY_PRESSED);
       return true;
     case IDC_NEW_INCOGNITO_WINDOW:
       *accelerator = ui::Accelerator(ui::VKEY_N,
-                                     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN);
+                                     ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                                     ui::ET_KEY_PRESSED);
       return true;
 #endif
   }
   // Else, we retrieve the accelerator information from the frame.
   return GetWidget()->GetAccelerator(command_id, accelerator);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ToolbarView, views::View overrides:
 
@@ skipping 286 matching lines @@
     accname_app = l10n_util::GetStringFUTF16(
         IDS_ACCNAME_APP_UPGRADE_RECOMMENDED, accname_app);
   }
   app_menu_->SetAccessibleName(accname_app);
 
   app_menu_->SetIcon(GetAppMenuIcon(views::CustomButton::BS_NORMAL));
   app_menu_->SetHoverIcon(GetAppMenuIcon(views::CustomButton::BS_HOT));
   app_menu_->SetPushedIcon(GetAppMenuIcon(views::CustomButton::BS_PUSHED));
   SchedulePaint();
 }