wip: Add ui::EventType parameter.

chrome/browser/ui/views/frame/browser_view.cc

Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 004560b51256321a1f72d8887d347a968904c514..a54ccfffc32efc43da9ea4bc090d37e83370b048 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -471,13 +471,16 @@ bool BrowserView::GetAccelerator(int cmd_id, ui::Accelerator* accelerator) {
   // anywhere so we need to check for them explicitly here.
   switch (cmd_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;
   }
   // Else, we retrieve the accelerator information from the accelerator table.
@@ -1178,9 +1181,9 @@ bool BrowserView::PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
 
   ui::Accelerator accelerator(
       static_cast<ui::KeyboardCode>(event.windowsKeyCode),
-      content::GetModifiersFromNativeWebKeyboardEvent(event));
-  if (event.type == WebKit::WebInputEvent::KeyUp)
-    accelerator.set_type(ui::ET_KEY_RELEASED);
+      content::GetModifiersFromNativeWebKeyboardEvent(event),
+      (event.type == WebKit::WebInputEvent::KeyUp) ?
+      ui::ET_KEY_RELEASED : ui::ET_KEY_PRESSED);
 
   // What we have to do here is as follows:
   // - If the |browser_| is for an app, do nothing.
@@ -2170,7 +2173,8 @@ void BrowserView::LoadAccelerators() {
   // Let's fill our own accelerator table.
   for (size_t i = 0; i < browser::kAcceleratorMapLength; ++i) {
     ui::Accelerator accelerator(browser::kAcceleratorMap[i].keycode,
-                                browser::kAcceleratorMap[i].modifiers);
+                                browser::kAcceleratorMap[i].modifiers,
+                                ui::ET_KEY_PRESSED);
     accelerator_table_[accelerator] = browser::kAcceleratorMap[i].command_id;
 
     // Also register with the focus manager.