Redesigns the text input focus handling.

ui/wm/core/focus_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 "ui/wm/core/focus_controller.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_tracker.h"
+#include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/events/event.h"
 #include "ui/wm/core/focus_rules.h"
 #include "ui/wm/core/window_util.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace wm {
 namespace {
 
 // When a modal window is activated, we bring its entire transient parent chain
 // to the front. This function must be called before the modal transient is
@@ skipping 103 matching lines @@
   aura::Window* activatable =
       focusable ? rules_->GetActivatableWindow(focusable) : NULL;
 
   // We need valid focusable/activatable windows in the event we're not clearing
   // focus. "Clearing focus" is inferred by whether or not |window| passed to
   // this function is non-NULL.
   if (window && (!focusable || !activatable))
     return;
   DCHECK((focusable && activatable) || !window);
 
+  // |window| is going to get the focus, so reset the text input client.
+  // SetActiveWindow() and/or SetFocusedWindow() may set a proper text input
+  // client if the implementation supports text input.
+  ui::TextInputFocusManager* text_input_focus_manager =
+      ui::TextInputFocusManager::GetInstance();
+  if (window)
+    text_input_focus_manager->FocusTextInputClient(NULL);

[sky, 2014/04/25 18:20:21]

Shouldn't all this be in SetFocusedWindow?

[Yuki, 2014/04/28 12:59:29]

You're right.  Moved.

+
   // Activation change observers may change the focused window. If this happens
   // we must not adjust the focus below since this will clobber that change.
   aura::Window* last_focused_window = focused_window_;
   if (!updating_activation_)
     SetActiveWindow(window, activatable);
 
   // If the window's ActivationChangeObserver shifted focus to a valid window,
   // we don't want to focus the window we thought would be focused by default.
   bool activation_changed_focus = last_focused_window != focused_window_;
   if (!updating_focus_ && (!activation_changed_focus || !focused_window_)) {
     if (active_window_ && focusable)
       DCHECK(active_window_->Contains(focusable));
     SetFocusedWindow(focusable);
   }
+
+  // Ensure that the text input client is reset when the window loses the focus.
+  if (!window)
+    text_input_focus_manager->FocusTextInputClient(NULL);
 }
 
 void FocusController::ResetFocusWithinActiveWindow(aura::Window* window) {
   DCHECK(window);
   if (!active_window_)
     return;
   if (!active_window_->Contains(window))
     return;
   SetFocusedWindow(window);
 }
@@ skipping 184 matching lines @@
 
 void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
   // Only focus |window| if it or any of its parents can be focused. Otherwise
   // FocusWindow() will focus the topmost window, which may not be the
   // currently focused one.
   if (rules_->CanFocusWindow(GetToplevelWindow(window)))
     FocusWindow(window);
 }
 
 }  // namespace wm