IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ui/views/ime/input_method_bridge.cc

 // Copyright (c) 2011 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/views/ime/input_method_bridge.h"
 
 #include "ui/base/ime/input_method.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 InputMethodBridge::InputMethodBridge(internal::InputMethodDelegate* delegate,
                                      ui::InputMethod* host)
     : host_(host),
       context_focused_(false) {
-  DCHECK(host_);
   set_delegate(delegate);
 }
 
 InputMethodBridge::~InputMethodBridge() {
-  if (host_->GetTextInputClient() == this)
+  if (host_ && host_->GetTextInputClient() == this)
     host_->SetFocusedTextInputClient(NULL);
 }
 
 void InputMethodBridge::Init(Widget* widget) {
   InputMethodBase::Init(widget);
 }
 
 void InputMethodBridge::OnFocus() {
-  DCHECK(!widget_focused());
+  // Disabling the DCHECK for now since views_unittests seems to call
+  // views::InputMethod::OnFocus and OnBlur in a wrong way.
+  // TODO(yusukes): Reenable it once views_unittests are fixed.
+  // DCHECK(!widget_focused());
   InputMethodBase::OnFocus();
 
   // Ask the system-wide IME to send all TextInputClient messages to |this|
   // object.
-  host_->SetFocusedTextInputClient(this);
+  if (host_)
+    host_->SetFocusedTextInputClient(this);
 
   // TODO(yusukes): We don't need to call OnTextInputTypeChanged() once we move
   // text input type tracker code to ui::InputMethodBase.
   if (GetFocusedView())
     OnTextInputTypeChanged(GetFocusedView());
 }
 
 void InputMethodBridge::OnBlur() {
-  DCHECK(widget_focused());
+  // TODO(yusukes): Reenable it once views_unittests are fixed.
+  // DCHECK(widget_focused());
 
   ConfirmCompositionText();
   InputMethodBase::OnBlur();
-  if (host_->GetTextInputClient() == this)
+  if (host_ && host_->GetTextInputClient() == this)
     host_->SetFocusedTextInputClient(NULL);
 }
 
 void InputMethodBridge::DispatchKeyEvent(const KeyEvent& key) {
   DCHECK(key.type() == ui::ET_KEY_PRESSED || key.type() == ui::ET_KEY_RELEASED);
   DCHECK(widget_focused());
 
   // We can just dispatch the event here since the |key| is already processed by
   // the system-wide IME.
   DispatchKeyEventPostIME(key);
 }
 
 void InputMethodBridge::OnTextInputTypeChanged(View* view) {
-  if (IsViewFocused(view))
+  if (host_ && IsViewFocused(view))
     host_->OnTextInputTypeChanged(this);
   InputMethodBase::OnTextInputTypeChanged(view);
 }
 
 void InputMethodBridge::OnCaretBoundsChanged(View* view) {
-  if (IsViewFocused(view) && !IsTextInputTypeNone())
+  if (host_ && IsViewFocused(view) && !IsTextInputTypeNone())
     host_->OnCaretBoundsChanged(this);
 }
 
 void InputMethodBridge::CancelComposition(View* view) {
-  if (IsViewFocused(view))
+  if (host_ && IsViewFocused(view))
     host_->CancelComposition(this);
 }
 
 std::string InputMethodBridge::GetInputLocale() {
-  return host_->GetInputLocale();
+  return host_ ? host_->GetInputLocale() : "";
 }
 
 base::i18n::TextDirection InputMethodBridge::GetInputTextDirection() {
-  return host_->GetInputTextDirection();
+  return host_ ? host_->GetInputTextDirection() : base::i18n::UNKNOWN_DIRECTION;
 }
 
 bool InputMethodBridge::IsActive() {
-  return host_->IsActive();
+  return host_ ? host_->IsActive() : false;
 }
 
 // Overridden from TextInputClient. Forward an event from the system-wide IME
 // to the text input |client|, which is e.g. views::NativeTextfieldViews.
 void InputMethodBridge::SetCompositionText(
     const ui::CompositionText& composition) {
   TextInputClient* client = GetTextInputClient();
   if (client)
     client->SetCompositionText(composition);
 }
@@ skipping 96 matching lines @@
 void InputMethodBridge::OnWillChangeFocus(View* focused_before, View* focused) {
   ConfirmCompositionText();
 }
 
 void InputMethodBridge::OnDidChangeFocus(View* focused_before, View* focused) {
   OnTextInputTypeChanged(GetFocusedView());
   OnCaretBoundsChanged(GetFocusedView());
 }
 
 }  // namespace views