text input focus: Supports Window::GetFocusedTextInputClient.

This CL is split off from http://crrev.com/785463002 and
Window::GetFocusedTextInputClient is necessary in that CL.

BUG=290701

Review URL: https://codereview.chromium.org/860983004

Cr-Commit-Position: refs/heads/master@{#313448}

ash/display/cursor_window_controller.cc

@@ -33,6 +33,7 @@ class CursorWindowDelegate : public aura::WindowDelegate {
   gfx::Size GetMaximumSize() const override { return size_; }
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }

ash/drag_drop/drag_drop_controller.cc

@@ -88,6 +88,7 @@ class DragDropTrackerDelegate : public aura::WindowDelegate {
 
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }

ash/root_window_controller.cc

@@ -221,6 +221,7 @@ class EmptyWindowDelegate : public aura::WindowDelegate {
   gfx::Size GetMaximumSize() const override { return gfx::Size(); }
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }

content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -1704,6 +1704,10 @@ void RenderWidgetHostViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
     GetInputMethod()->OnCaretBoundsChanged(this);
 }
 
+ui::TextInputClient* RenderWidgetHostViewAura::GetFocusedTextInputClient() {
+  return GetTextInputClient();
+}
+
 gfx::NativeCursor RenderWidgetHostViewAura::GetCursor(const gfx::Point& point) {
   if (mouse_locked_)
     return ui::kCursorNone;

content/browser/renderer_host/render_widget_host_view_aura.h

@@ -276,6 +276,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override;
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(

content/browser/web_contents/aura/image_window_delegate.cc

@@ -43,6 +43,10 @@ void ImageWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
     size_mismatch_ = window_size_ != image_.AsImageSkia().size();
 }
 
+ui::TextInputClient* ImageWindowDelegate::GetFocusedTextInputClient() {
+  return nullptr;
+}
+
 gfx::NativeCursor ImageWindowDelegate::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }

content/browser/web_contents/aura/image_window_delegate.h

@@ -29,6 +29,7 @@ class CONTENT_EXPORT ImageWindowDelegate : public aura::WindowDelegate {
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override;
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(

content/browser/web_contents/web_contents_view_aura.cc

@@ -1435,6 +1435,10 @@ void WebContentsViewAura::OnBoundsChanged(const gfx::Rect& old_bounds,
   }
 }
 
+ui::TextInputClient* WebContentsViewAura::GetFocusedTextInputClient() {
+  return nullptr;
+}
+
 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }

content/browser/web_contents/web_contents_view_aura.h

@@ -159,6 +159,7 @@ class WebContentsViewAura
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override;
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(

ui/aura/demo/demo_main.cc

@@ -45,6 +45,7 @@ class DemoWindowDelegate : public aura::WindowDelegate {
 
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }
@@ -81,7 +82,7 @@ class DemoWindowTreeClient : public aura::client::WindowTreeClient {
   }
 
   ~DemoWindowTreeClient() override {
-    aura::client::SetWindowTreeClient(window_, NULL);
+    aura::client::SetWindowTreeClient(window_, nullptr);
   }
 
   // Overridden from aura::client::WindowTreeClient:

ui/aura/test/test_window_delegate.cc

@@ -50,6 +50,10 @@ void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
 }
 
+ui::TextInputClient* TestWindowDelegate::GetFocusedTextInputClient() {
+  return &text_input_client_;
+}
+
 gfx::NativeCursor TestWindowDelegate::GetCursor(const gfx::Point& point) {
   return gfx::kNullCursor;
 }

ui/aura/test/test_window_delegate.h

@@ -10,6 +10,7 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window_delegate.h"
+#include "ui/base/ime/dummy_text_input_client.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/rect.h"
 
@@ -46,6 +47,7 @@ class TestWindowDelegate : public WindowDelegate {
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override;
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(
@@ -66,6 +68,7 @@ class TestWindowDelegate : public WindowDelegate {
   bool delete_on_destroyed_;
   gfx::Size minimum_size_;
   gfx::Size maximum_size_;
+  ui::DummyTextInputClient text_input_client_;
   bool can_focus_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);

ui/aura/window.cc

@@ -647,6 +647,10 @@ void Window::ConvertRectToTarget(const Window* source,
   rect->set_origin(origin);
 }
 
+ui::TextInputClient* Window::GetFocusedTextInputClient() {
+  return delegate_ ? delegate_->GetFocusedTextInputClient() : nullptr;
+}
+
 void Window::MoveCursorTo(const gfx::Point& point_in_window) {
   Window* root_window = GetRootWindow();
   DCHECK(root_window);

ui/aura/window.h

@@ -38,6 +38,7 @@ class Vector2d;
 namespace ui {
 class EventHandler;
 class Layer;
+class TextInputClient;
 class Texture;
 }
 
@@ -218,6 +219,10 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
                                   const Window* target,
                                   gfx::Rect* rect);
 
+  // Returns the focused text input client within this window.
+  // This function does not look at child windows.
+  ui::TextInputClient* GetFocusedTextInputClient();
+
   // Moves the cursor to the specified location relative to the window.
   void MoveCursorTo(const gfx::Point& point_in_window);
 

ui/aura/window_delegate.h

@@ -25,6 +25,7 @@ class GestureEvent;
 class KeyEvent;
 class Layer;
 class MouseEvent;
+class TextInputClient;
 class Texture;
 class TouchEvent;
 }
@@ -44,6 +45,10 @@ class AURA_EXPORT WindowDelegate : public ui::EventHandler {
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) = 0;
 
+  // Returns the focused text input client within this window.
+  // This function does not look at child windows.
+  virtual ui::TextInputClient* GetFocusedTextInputClient() = 0;
+
   // Returns the native cursor for the specified point, in window coordinates,
   // or NULL for the default cursor.
   virtual gfx::NativeCursor GetCursor(const gfx::Point& point) = 0;

ui/keyboard/keyboard_controller.cc

@@ -93,6 +93,9 @@ class KeyboardWindowDelegate : public aura::WindowDelegate {
                        const gfx::Rect& new_bounds) override {
     bounds_ = new_bounds;
   }
+  ui::TextInputClient* GetFocusedTextInputClient() override {
+    return nullptr;
+  }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }

ui/views/controls/native/native_view_host_aura.cc

@@ -30,6 +30,7 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate {
   gfx::Size GetMaximumSize() const override { return gfx::Size(); }
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override { return nullptr; }
   gfx::NativeCursor GetCursor(const gfx::Point& point) override {
     return gfx::kNullCursor;
   }

ui/views/widget/desktop_aura/desktop_native_widget_aura.cc

@@ -982,6 +982,10 @@ gfx::Size DesktopNativeWidgetAura::GetMaximumSize() const {
   return native_widget_delegate_->GetMaximumSize();
 }
 
+ui::TextInputClient* DesktopNativeWidgetAura::GetFocusedTextInputClient() {
+  return GetWidget()->GetFocusedTextInputClient();
+}
+
 gfx::NativeCursor DesktopNativeWidgetAura::GetCursor(const gfx::Point& point) {
   return cursor_;
 }

ui/views/widget/desktop_aura/desktop_native_widget_aura.h

@@ -187,6 +187,7 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override {}
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(

ui/views/widget/native_widget_aura.cc

@@ -771,6 +771,10 @@ void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
     delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
 }
 
+ui::TextInputClient* NativeWidgetAura::GetFocusedTextInputClient() {
+  return GetWidget()->GetFocusedTextInputClient();
+}
+
 gfx::NativeCursor NativeWidgetAura::GetCursor(const gfx::Point& point) {
   return cursor_;
 }

ui/views/widget/native_widget_aura.h

@@ -146,6 +146,7 @@ class VIEWS_EXPORT NativeWidgetAura
   gfx::Size GetMaximumSize() const override;
   void OnBoundsChanged(const gfx::Rect& old_bounds,
                        const gfx::Rect& new_bounds) override;
+  ui::TextInputClient* GetFocusedTextInputClient() override;
   gfx::NativeCursor GetCursor(const gfx::Point& point) override;
   int GetNonClientComponent(const gfx::Point& point) const override;
   bool ShouldDescendIntoChildForEventHandling(

ui/views/widget/widget.cc

@@ -439,9 +439,9 @@ void Widget::NotifyNativeViewHierarchyChanged() {
 }
 
 void Widget::NotifyWillRemoveView(View* view) {
-    FOR_EACH_OBSERVER(WidgetRemovalsObserver,
-                      removals_observers_,
-                      OnWillRemoveView(this, view));
+  FOR_EACH_OBSERVER(WidgetRemovalsObserver,
+                    removals_observers_,
+                    OnWillRemoveView(this, view));
 }
 
 // Converted methods (see header) ----------------------------------------------
@@ -758,6 +758,12 @@ const FocusManager* Widget::GetFocusManager() const {
   return toplevel_widget ? toplevel_widget->focus_manager_.get() : NULL;
 }
 
+ui::TextInputClient* Widget::GetFocusedTextInputClient() {
+  FocusManager* focus_manager = GetFocusManager();
+  View* view = focus_manager ? focus_manager->GetFocusedView() : nullptr;
+  return view ? view->GetTextInputClient() : nullptr;
+}
+
 InputMethod* Widget::GetInputMethod() {
   return const_cast<InputMethod*>(
       const_cast<const Widget*>(this)->GetInputMethod());

ui/views/widget/widget.h

@@ -567,6 +567,9 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   FocusManager* GetFocusManager();
   const FocusManager* GetFocusManager() const;
 
+  // Returns the focused text input client within this widget.
+  ui::TextInputClient* GetFocusedTextInputClient();
+
   // Returns the InputMethod for this widget.
   // Note that all widgets in a widget hierarchy share the same input method.
   InputMethod* GetInputMethod();