Redesigns the text input focus handling.

ui/views/widget/native_widget_private.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_
 
 #include "base/strings/string16.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/native_widget_types.h"
-#include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/widget/native_widget.h"
 
 namespace gfx {
 class FontList;
 class ImageSkia;
 class Rect;
 }
 
 namespace ui {
+class InputMethod;
 class NativeTheme;
 class OSExchangeData;
 }
 
 namespace views {
 class InputMethod;
+class InputMethodDelegate;
 class TooltipManager;
 namespace internal {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetPrivate interface
 //
 //  A NativeWidget subclass internal to views that provides Widget a conduit for
 //  communication with a backend-specific native widget implementation.
 //
 //  Many of the methods here are pass-thrus for Widget, and as such there is no
@@ skipping 101 matching lines @@
 
   // Returns the InputMethod for this native widget.
   // Note that all widgets in a widget hierarchy share the same input method.
   // TODO(suzhe): rename to GetInputMethod() when NativeWidget implementation
   // class doesn't inherit Widget anymore.
   virtual InputMethod* CreateInputMethod() = 0;
 
   // Returns the InputMethodDelegate for this native widget.
   virtual InputMethodDelegate* GetInputMethodDelegate() = 0;
 
+  // Returns the ui::InputMethod for this native widget.
+  // TODO(yukishiino): Rename this method to GetInputMethod once we remove
+  // views::InputMethod.
+  virtual ui::InputMethod* GetHostInputMethod() = 0;
 
   // Centers the window and sizes it to the specified size.
   virtual void CenterWindow(const gfx::Size& size) = 0;
 
   // Retrieves the window's current restored bounds and "show" state, for
   // persisting.
   virtual void GetWindowPlacement(
       gfx::Rect* bounds,
       ui::WindowShowState* show_state) const = 0;
 
@@ skipping 67 matching lines @@
 
   // Overridden from NativeWidget:
   virtual internal::NativeWidgetPrivate* AsNativeWidgetPrivate() OVERRIDE;
   virtual ui::EventHandler* GetEventHandler() = 0;
 };
 
 }  // namespace internal
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_PRIVATE_H_