Converts ui::Accelerator::type to an enum

ash/common/accelerators/accelerator_controller.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 "ash/common/accelerators/accelerator_controller.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
@@ skipping 139 matching lines @@
       message_center::RichNotificationData(),
       new DeprecatedAcceleratorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 ui::Accelerator CreateAccelerator(ui::KeyboardCode keycode,
                                   int modifiers,
                                   bool trigger_on_press) {
   ui::Accelerator accelerator(keycode, modifiers);
-  accelerator.set_type(trigger_on_press ? ui::ET_KEY_PRESSED
-                                        : ui::ET_KEY_RELEASED);
+  accelerator.set_key_state(trigger_on_press
+                                ? ui::Accelerator::KeyState::PRESSED
+                                : ui::Accelerator::KeyState::RELEASED);
   return accelerator;
 }
 
 void RecordUmaHistogram(const char* histogram_name,
                         DeprecatedAcceleratorUsage sample) {
   auto* histogram = base::LinearHistogram::FactoryGet(
       histogram_name, 1, DEPRECATED_USAGE_COUNT, DEPRECATED_USAGE_COUNT + 1,
       base::HistogramBase::kUmaTargetedHistogramFlag);
   histogram->Add(sample);
 }
@@ skipping 104 matching lines @@
   WmShell::Get()->new_window_controller()->OpenFeedbackPage();
 }
 
 bool CanHandlePreviousIme(ImeControlDelegate* ime_control_delegate) {
   return ime_control_delegate && ime_control_delegate->CanCycleIme();
 }
 
 void HandlePreviousIme(ImeControlDelegate* ime_control_delegate,
                        const ui::Accelerator& accelerator) {
   base::RecordAction(UserMetricsAction("Accel_Previous_Ime"));
-  if (accelerator.type() == ui::ET_KEY_PRESSED)
+  if (accelerator.key_state() == ui::Accelerator::KeyState::PRESSED)
     ime_control_delegate->HandlePreviousIme();
   // Else: consume the Ctrl+Space ET_KEY_RELEASED event but do not do anything.
 }
 
 void HandleRestoreTab() {
   base::RecordAction(UserMetricsAction("Accel_Restore_Tab"));
   WmShell::Get()->new_window_controller()->RestoreTab();
 }
 
 // Rotate the active window.
@@ skipping 65 matching lines @@
   base::RecordAction(UserMetricsAction("Accel_Switch_Ime"));
   ime_control_delegate->HandleSwitchIme(accelerator);
 }
 
 bool CanHandleToggleAppList(const ui::Accelerator& accelerator,
                             const ui::Accelerator& previous_accelerator) {
   if (accelerator.key_code() == ui::VKEY_LWIN) {
     // If something else was pressed between the Search key (LWIN)
     // being pressed and released, then ignore the release of the
     // Search key.
-    if (previous_accelerator.type() != ui::ET_KEY_PRESSED ||
+    if (previous_accelerator.key_state() !=
+            ui::Accelerator::KeyState::PRESSED ||
         previous_accelerator.key_code() != ui::VKEY_LWIN) {
       return false;
     }
 
     // When spoken feedback is enabled, we should neither toggle the list nor
     // consume the key since Search+Shift is one of the shortcuts the a11y
     // feature uses. crbug.com/132296
     if (Shell::GetInstance()
             ->accessibility_delegate()
             ->IsSpokenFeedbackEnabled())
@@ skipping 76 matching lines @@
 }
 
 void HandleCrosh() {
   base::RecordAction(UserMetricsAction("Accel_Open_Crosh"));
 
   WmShell::Get()->new_window_controller()->OpenCrosh();
 }
 
 bool CanHandleDisableCapsLock(const ui::Accelerator& previous_accelerator) {
   ui::KeyboardCode previous_key_code = previous_accelerator.key_code();
-  if (previous_accelerator.type() == ui::ET_KEY_RELEASED ||
+  if (previous_accelerator.key_state() == ui::Accelerator::KeyState::RELEASED ||
       (previous_key_code != ui::VKEY_LSHIFT &&
        previous_key_code != ui::VKEY_SHIFT &&
        previous_key_code != ui::VKEY_RSHIFT)) {
     // If something else was pressed between the Shift key being pressed
     // and released, then ignore the release of the Shift key.
     return false;
   }
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
   chromeos::input_method::ImeKeyboard* keyboard =
@@ skipping 67 matching lines @@
 }
 
 bool CanHandleToggleCapsLock(const ui::Accelerator& accelerator,
                              const ui::Accelerator& previous_accelerator) {
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
 
   // This shortcust is set to be trigger on release. Either the current
   // accelerator is a Search release or Alt release.
   if (accelerator.key_code() == ui::VKEY_LWIN &&
-      accelerator.type() == ui::ET_KEY_RELEASED) {
+      accelerator.key_state() == ui::Accelerator::KeyState::RELEASED) {
     // The previous must be either an Alt press or Search press:
     // 1. Press Alt, Press Search, Release Search, Release Alt.
     // 2. Press Search, Press Alt, Release Search, Release Alt.
-    if (previous_accelerator.type() == ui::ET_KEY_PRESSED &&
+    if (previous_accelerator.key_state() ==
+            ui::Accelerator::KeyState::PRESSED &&
         (previous_accelerator.key_code() == ui::VKEY_LWIN ||
          previous_accelerator.key_code() == ui::VKEY_MENU)) {
       return ime && ime->GetImeKeyboard();
     }
   }
 
   // Alt release.
   if (accelerator.key_code() == ui::VKEY_MENU &&
-      accelerator.type() == ui::ET_KEY_RELEASED) {
+      accelerator.key_state() == ui::Accelerator::KeyState::RELEASED) {
     // The previous must be either an Alt press or Search press:
     // 3. Press Alt, Press Search, Release Alt, Release Search.
     // 4. Press Search, Press Alt, Release Alt, Release Search.
-    if (previous_accelerator.type() == ui::ET_KEY_PRESSED &&
+    if (previous_accelerator.key_state() ==
+            ui::Accelerator::KeyState::PRESSED &&
         (previous_accelerator.key_code() == ui::VKEY_LWIN ||
          previous_accelerator.key_code() == ui::VKEY_MENU)) {
       return ime && ime->GetImeKeyboard();
     }
   }
 
   return false;
 }
 
 void HandleToggleCapsLock() {
@@ skipping 702 matching lines @@
       data->uma_histogram_name, data->notification_message_id,
       data->old_shortcut_id, data->new_shortcut_id);
 
   if (!data->deprecated_enabled)
     return AcceleratorProcessingStatus::STOP;
 
   return AcceleratorProcessingStatus::PROCEED;
 }
 
 }  // namespace ash