WIP: Always update ui::AcceleratorManager

ui/base/accelerators/accelerator_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/base/accelerators/accelerator_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 
 namespace ui {
 
-AcceleratorManager::AcceleratorManager() : last_event_type_(ET_KEY_PRESSED) {
+AcceleratorManager::AcceleratorManager() {
 }
 
 AcceleratorManager::~AcceleratorManager() {
 }
 
 void AcceleratorManager::Register(const Accelerator& accelerator,
                                   HandlerPriority priority,
                                   AcceleratorTarget* target) {
   AcceleratorTargetList& targets = accelerators_[accelerator].second;
   DCHECK(std::find(targets.begin(), targets.end(), target) == targets.end())
@@ skipping 60 matching lines @@
     AcceleratorTargetList targets(map_iter->second.second);
     for (AcceleratorTargetList::iterator iter = targets.begin();
          iter != targets.end(); ++iter) {
       if ((*iter)->CanHandleAccelerators() &&
           (*iter)->AcceleratorPressed(accelerator)) {
         result = true;
         break;
       }
     }
   }
-  last_event_type_ = accelerator.type();
+  set_last_event(accelerator);
   return result;
 }
 
 AcceleratorTarget* AcceleratorManager::GetCurrentTarget(
     const Accelerator& accelerator) const {
   AcceleratorMap::const_iterator map_iter = accelerators_.find(accelerator);
   if (map_iter == accelerators_.end() || map_iter->second.second.empty())
     return NULL;
   return map_iter->second.second.front();
 }
@@ skipping 13 matching lines @@
   return map_iter->second.second.front()->CanHandleAccelerators();
 }
 
 bool AcceleratorManager::ShouldHandle(const Accelerator& accelerator) const {
   if (accelerator.type() != ET_KEY_RELEASED)
     return true;
 
   // This check is necessary e.g. not to process the Shift+Alt+ET_KEY_RELEASED
   // Accelerator for Chrome OS (see ash/accelerators/accelerator_controller.cc)
   // when Shift+Alt+Tab is pressed and then Tab is released.
-  return last_event_type_ == ET_KEY_PRESSED;
+  return last_event_.type() == ET_KEY_PRESSED;
 }
 
 }  // namespace ui