Set the current input context handler when the toplevel window is activated instead of when the inp…

ui/base/ime/input_method_base.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 "ui/base/ime/input_method_base.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/ime/ime_bridge.h"
 #include "ui/base/ime/input_method_delegate.h"
 #include "ui/base/ime/input_method_observer.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/events/event.h"
 
 namespace ui {
 
 InputMethodBase::InputMethodBase()
-    : delegate_(NULL), text_input_client_(NULL) {}
+    : delegate_(nullptr), text_input_client_(nullptr) {}
 
 InputMethodBase::~InputMethodBase() {
   FOR_EACH_OBSERVER(InputMethodObserver,
                     observer_list_,
                     OnInputMethodDestroyed(this));
   if (ui::IMEBridge::Get() &&
       ui::IMEBridge::Get()->GetInputContextHandler() == this)
     ui::IMEBridge::Get()->SetInputContextHandler(nullptr);
 }
 
 void InputMethodBase::SetDelegate(internal::InputMethodDelegate* delegate) {
   delegate_ = delegate;
 }
 
-void InputMethodBase::OnFocus() {}
+void InputMethodBase::OnFocus() {
+  if (ui::IMEBridge::Get())
+    ui::IMEBridge::Get()->SetInputContextHandler(this);
+}
 
-void InputMethodBase::OnBlur() {}
+void InputMethodBase::OnBlur() {
+  if (ui::IMEBridge::Get() &&
+      ui::IMEBridge::Get()->GetInputContextHandler() == this)
+    ui::IMEBridge::Get()->SetInputContextHandler(nullptr);
+}
 
 void InputMethodBase::SetFocusedTextInputClient(TextInputClient* client) {
   SetFocusedTextInputClientInternal(client);
-  if (ui::IMEBridge::Get())
-    ui::IMEBridge::Get()->SetInputContextHandler(this);
 }
 
 void InputMethodBase::DetachTextInputClient(TextInputClient* client) {
   if (text_input_client_ != client)
     return;
-  SetFocusedTextInputClientInternal(NULL);
+  SetFocusedTextInputClientInternal(nullptr);
 }
 
 TextInputClient* InputMethodBase::GetTextInputClient() const {
   return text_input_client_;
 }
 
 void InputMethodBase::OnTextInputTypeChanged(const TextInputClient* client) {
   if (!IsTextInputClientFocused(client))
     return;
   NotifyTextInputStateChanged(client);
@@ skipping 65 matching lines @@
   FOR_EACH_OBSERVER(
       InputMethodObserver, observer_list_, OnCaretBoundsChanged(client));
 }
 
 void InputMethodBase::SetFocusedTextInputClientInternal(
     TextInputClient* client) {
   TextInputClient* old = text_input_client_;
   if (old == client)
     return;
   OnWillChangeFocusedClient(old, client);
-  text_input_client_ = client;  // NULL allowed.
+  text_input_client_ = client;  // nullptr allowed.
   OnDidChangeFocusedClient(old, client);
   NotifyTextInputStateChanged(text_input_client_);
 }
 
 std::vector<gfx::Rect> InputMethodBase::GetCompositionBounds(
     const TextInputClient* client) {
   std::vector<gfx::Rect> bounds;
   if (client->HasCompositionText()) {
     uint32_t i = 0;
     gfx::Rect rect;
@@ skipping 39 matching lines @@
       GetTextInputClient()->SetCompositionText(composition_);
     else
       GetTextInputClient()->ClearCompositionText();
   }
   SendFakeProcessKeyEvent(false);
 }
 
 void InputMethodBase::DeleteSurroundingText(int32_t offset, uint32_t length) {}
 
 }  // namespace ui