wip: Add ui::EventType parameter.

chrome/browser/chromeos/login/webui_login_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/chromeos/login/webui_login_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 110 matching lines @@
                  chrome::NOTIFICATION_LOGIN_USER_IMAGES_LOADED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_WIZARD_FIRST_SCREEN_SHOWN,
                  content::NotificationService::AllSources());
 
   accel_map_[ui::Accelerator(ui::VKEY_Z,
-                             ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
+                             ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+                             ui::ET_KEY_PRESSED)] =
       kAccelNameAccessibility;
-  accel_map_[ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE)] =
+  accel_map_[ui::Accelerator(ui::VKEY_ESCAPE,
+                             ui::EF_NONE,
+                             ui::ET_KEY_PRESSED)] =
       kAccelNameCancel;
   accel_map_[ui::Accelerator(ui::VKEY_E,
-                             ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)] =
+                             ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
+                             ui::ET_KEY_PRESSED)] =
       kAccelNameEnrollment;
   // This should be kept in sync with the IDC_EXIT accelerator.
   accel_map_[ui::Accelerator(ui::VKEY_Q,
-                             ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN)] =
+                             ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                             ui::ET_KEY_PRESSED)] =
       kAccelNameExit;
-  accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN)] =
+  accel_map_[ui::Accelerator(ui::VKEY_V, ui::EF_ALT_DOWN, ui::ET_KEY_PRESSED)] =
       kAccelNameVersion;
 
   for (AccelMap::iterator i(accel_map_.begin()); i != accel_map_.end(); ++i)
     AddAccelerator(i->first);
 }
 
 WebUILoginView::~WebUILoginView() {
   ash::SystemTray* tray = ash::Shell::GetInstance()->tray();
   if (tray)
     tray->SetNextFocusableView(NULL);
@@ skipping 184 matching lines @@
   return true;
 }
 
 void WebUILoginView::ReturnFocus(bool reverse) {
   // Return the focus to the web contents.
   webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
   GetWidget()->Activate();
 }
 
 }  // namespace chromeos