Redesigns the text input focus handling.

ui/wm/core/focus_controller_unittest.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 <map>
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tracker.h"
+#include "ui/base/ime/dummy_text_input_client.h"
+#include "ui/base/ime/text_input_focus_manager.h"
 #include "ui/events/event_handler.h"
 #include "ui/wm/core/base_focus_rules.h"
 #include "ui/wm/core/wm_state.h"
 #include "ui/wm/public/activation_change_observer.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace wm {
 
 class FocusNotificationObserver : public aura::client::ActivationChangeObserver,
                                   public aura::client::FocusChangeObserver {
@@ skipping 216 matching lines @@
     }
   }
 
  private:
   aura::Window* target_;
   aura::WindowTracker tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTargetFocusNotificationObserver);
 };
 
+class ScopedFocusedTextInputClientChanger
+    : public ScopedFocusNotificationObserver {
+ public:
+  ScopedFocusedTextInputClientChanger(aura::Window* root_window,
+                                      ui::TextInputClient* text_input_client)
+      : ScopedFocusNotificationObserver(root_window),
+        text_input_client_(text_input_client) {}
+
+ private:
+  // Overridden from aura::client::FocusChangeObserver:
+  virtual void OnWindowFocused(aura::Window* gained_focus,
+                               aura::Window* lost_focus) OVERRIDE {
+    ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(
+        text_input_client_);
+  }
+
+  ui::TextInputClient* text_input_client_;
+};
+
 class FocusShiftingActivationObserver
     : public aura::client::ActivationChangeObserver {
  public:
   explicit FocusShiftingActivationObserver(aura::Window* activated_window)
       : activated_window_(activated_window),
         shift_focus_to_(NULL) {}
   virtual ~FocusShiftingActivationObserver() {}
 
   void set_shift_focus_to(aura::Window* shift_focus_to) {
     shift_focus_to_ = shift_focus_to;
@@ skipping 228 matching lines @@
     // change activation.
     DeactivateWindow(NULL);
     EXPECT_EQ(2, GetActiveWindowId());
     DeactivateWindow(GetActiveWindow());
     EXPECT_EQ(1, GetActiveWindowId());
   }
   virtual void FocusEvents() OVERRIDE {
     ScopedFocusNotificationObserver root_observer(root_window());
     ScopedTargetFocusNotificationObserver observer1(root_window(), 1);
     ScopedTargetFocusNotificationObserver observer2(root_window(), 2);
+    ui::TextInputFocusManager* text_input_focus_manager =
+        ui::TextInputFocusManager::GetInstance();
+    ui::DummyTextInputClient text_input_client;
+    ui::TextInputClient* null_text_input_client = NULL;
 
     root_observer.ExpectCounts(0, 0);
     observer1.ExpectCounts(0, 0);
     observer2.ExpectCounts(0, 0);
+    EXPECT_EQ(null_text_input_client,
+              text_input_focus_manager->GetFocusedTextInputClient());
 
+    text_input_focus_manager->FocusTextInputClient(&text_input_client);
     FocusWindowById(1);
     root_observer.ExpectCounts(1, 1);
     observer1.ExpectCounts(1, 1);
     observer2.ExpectCounts(0, 0);
+    // The focused text input client gets cleared when a window gets focused
+    // unless any of observers sets the focused text input client.
+    EXPECT_EQ(null_text_input_client,
+              text_input_focus_manager->GetFocusedTextInputClient());
 
+    ScopedFocusedTextInputClientChanger text_input_focus_changer(
+        root_window(), &text_input_client);
+    EXPECT_EQ(null_text_input_client,
+              text_input_focus_manager->GetFocusedTextInputClient());
     FocusWindowById(2);
     root_observer.ExpectCounts(2, 2);
     observer1.ExpectCounts(2, 2);
     observer2.ExpectCounts(1, 1);
+    // |text_input_focus_changer| sets the focused text input client.
+    EXPECT_EQ(&text_input_client,
+              text_input_focus_manager->GetFocusedTextInputClient());
+
+    FocusWindow(NULL);
+    // The focused text input client gets cleared when a window loses the focus.
+    EXPECT_EQ(null_text_input_client,
+              text_input_focus_manager->GetFocusedTextInputClient());
   }
   virtual void DuplicateFocusEvents() OVERRIDE {
     // Focusing an existing focused window should not resend focus events.
     ScopedFocusNotificationObserver root_observer(root_window());
     ScopedTargetFocusNotificationObserver observer1(root_window(), 1);
 
     root_observer.ExpectCounts(0, 0);
     observer1.ExpectCounts(0, 0);
 
     FocusWindowById(1);
@@ skipping 648 matching lines @@
 // Clicking on a window which has capture should not result in a focus change.
 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow);
 
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest,
                       ChangeFocusWhenNothingFocusedAndCaptured);
 
 // See description above DontPassDeletedWindow() for details.
 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow);
 
 }  // namespace wm