Check IME state in ImeController

chrome/browser/ui/ash/ime_controller_chromeos.cc

Index: chrome/browser/ui/ash/ime_controller_chromeos.cc
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.cc b/chrome/browser/ui/ash/ime_controller_chromeos.cc
index f9637bb2a8ccc776568eab7734037e2508043968..aff89a02a069e75a1341f8ca11eebbdc9b18a597 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos.cc
@@ -10,6 +10,12 @@
 bool ImeController::CanCycleIme() {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
+  DCHECK(manager);
+  if (manager->GetActiveIMEState() == NULL) {

[xiyuan, 2017/04/27 03:16:41]

nit: NULL -> nullptr

of if (!manager->GetActiveIMEState()) {

[Wenzhao (Colin) Zang, 2017/04/27 03:31:55]

Done.

+    LOG(WARNING) << "Cannot cycle through input methods as they are not "
+                    "initialized yet.";
+    return false;
+  }
   return manager->GetActiveIMEState()->CanCycleInputMethod();
 }
 
@@ -28,6 +34,12 @@ void ImeController::HandlePreviousIme() {
 bool ImeController::CanSwitchIme(const ui::Accelerator& accelerator) {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
+  DCHECK(manager);
+  if (manager->GetActiveIMEState() == NULL) {

[xiyuan, 2017/04/27 03:16:41]

nit: ditto

[Wenzhao (Colin) Zang, 2017/04/27 03:31:55]

Done.

+    LOG(WARNING) << "Cannot switch input methods as they are not "
+                    "initialized yet.";
+    return false;
+  }
   return manager->GetActiveIMEState()->CanSwitchInputMethod(accelerator);
 }