Fix Caps Lock bug

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 533 matching lines @@
       base::RecordAction(UserMetricsAction("Accel_Switch_To_Previous_User"));
       break;
   }
   Shell::Get()->session_controller()->CycleActiveUser(direction);
 }
 
 bool CanHandleToggleCapsLock(const ui::Accelerator& accelerator,
                              const ui::Accelerator& previous_accelerator) {
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
+  if (!ime)
+    return false;

[oshima, 2017/04/11 19:04:47]

when ime is null?

[weidongg, 2017/04/11 22:55:43]

|ime| is checked below at |return| multiple times. Moving the check for |ime| is
not null up to be the first thing seems to be better than repeating it several
times.

 
   // 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.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.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 ime->GetImeKeyboard();
     }
   }
 
   // Alt release.
   if (accelerator.key_code() == ui::VKEY_MENU &&
       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.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 ime->GetImeKeyboard();
     }
   }
 
+  // Caps Lock release
+  if (accelerator.key_code() == ui::VKEY_CAPITAL &&
+      accelerator.key_state() == ui::Accelerator::KeyState::RELEASED) {
+    return ime->GetImeKeyboard();
+  }
+
   return false;
 }
 
 void HandleToggleCapsLock() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Caps_Lock"));
   chromeos::input_method::InputMethodManager* ime =
       chromeos::input_method::InputMethodManager::Get();
   chromeos::input_method::ImeKeyboard* keyboard = ime->GetImeKeyboard();
   keyboard->SetCapsLockEnabled(!keyboard->CapsLockIsEnabled());
 }
@@ skipping 701 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