wip: Add ui::EventType parameter.

ui/views/focus/focus_manager.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 "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 48 matching lines @@
     if ((key_code == ui::VKEY_MENU) &&
         (event.flags() & ~ui::EF_ALT_DOWN) == 0) {
       should_handle_menu_key_release_ = true;
       return false;
     }
     // Pass through to the rest of OnKeyEvent.
   } else if (key_code == ui::VKEY_MENU && should_handle_menu_key_release_ &&
              (event.flags() & ~ui::EF_ALT_DOWN) == 0) {
     // Trigger VKEY_MENU when only this key is pressed and released, and both
     // press and release events are not handled by others.
-    ui::Accelerator accelerator(ui::VKEY_MENU, ui::EF_NONE);
+    ui::Accelerator accelerator(ui::VKEY_MENU, ui::EF_NONE, ui::ET_KEY_PRESSED);
     return ProcessAccelerator(accelerator);
   } else if (event.type() != ui::ET_KEY_RELEASED) {
     return false;
   }
 #else
   if (event.type() != ui::ET_KEY_PRESSED && event.type() != ui::ET_KEY_RELEASED)
     return false;
 #endif
 
   int modifiers = ui::EF_NONE;
   if (event.IsShiftDown())
     modifiers |= ui::EF_SHIFT_DOWN;
   if (event.IsControlDown())
     modifiers |= ui::EF_CONTROL_DOWN;
   if (event.IsAltDown())
     modifiers |= ui::EF_ALT_DOWN;
-  ui::Accelerator accelerator(event.key_code(), modifiers);
-  accelerator.set_type(event.type());
+  ui::Accelerator accelerator(event.key_code(), modifiers, event.type());
 
   if (event.type() == ui::ET_KEY_PRESSED) {
 #if defined(OS_WIN)
     // If the focused view wants to process the key event as is, let it be.
     // This is not used for linux/aura.
     if (focused_view_ && focused_view_->SkipDefaultKeyEventProcessing(event) &&
         !accelerator_manager_->HasPriorityHandler(accelerator))
       return true;
 #endif
 
@@ skipping 381 matching lines @@
 
 void FocusManager::AddFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.AddObserver(listener);
 }
 
 void FocusManager::RemoveFocusChangeListener(FocusChangeListener* listener) {
   focus_change_listeners_.RemoveObserver(listener);
 }
 
 }  // namespace views