Converts ui::Accelerator::type to an enum

ash/mus/accelerators/accelerator_controller_registrar.cc

 // Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
@@ skipping 124 matching lines @@
   }
   DCHECK_EQ(0u, accelerator_to_ids_.count(accelerator));
   accelerator_to_ids_[accelerator] = ids;
   DCHECK_EQ(accelerator_to_ids_.size() * 2, ids_.size());
 
   ui::mojom::EventMatcherPtr pre_event_matcher = ui::CreateKeyMatcher(
       static_cast<ui::mojom::KeyboardCode>(accelerator.key_code()),
       accelerator.modifiers());
   pre_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::PRE_TARGET;
-  DCHECK(accelerator.type() == ui::ET_KEY_PRESSED ||
-         accelerator.type() == ui::ET_KEY_RELEASED);
   pre_event_matcher->type_matcher->type =
-      accelerator.type() == ui::ET_KEY_PRESSED
+      accelerator.key_state() == ui::Accelerator::KeyState::PRESSED
           ? ui::mojom::EventType::KEY_PRESSED
           : ui::mojom::EventType::KEY_RELEASED;
 
   ui::mojom::EventMatcherPtr post_event_matcher = pre_event_matcher.Clone();
   post_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::POST_TARGET;
 
   accelerator_vector.push_back(
       ui::CreateAccelerator(ComputeAcceleratorId(id_namespace_, ids.pre_id),
                             std::move(pre_event_matcher)));
@@ skipping 16 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash