Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/.

views/ime/input_method_base.h

 // Copyright (c) 2011 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 VIEWS_IME_INPUT_METHOD_BASE_H_
 #define VIEWS_IME_INPUT_METHOD_BASE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "views/focus/focus_manager.h"
 #include "views/ime/input_method.h"
 #include "views/ime/input_method_delegate.h"
-
-namespace gfx {
-class Rect;
-}  // namespace gfx
-
-namespace ui {
-class TextInputClient;
-}  // namespace ui
+#include "views/ime/text_input_client.h"
 
 namespace views {
 
 class View;
 
 // A helper class providing functionalities shared among InputMethod
 // implementations.
 class VIEWS_EXPORT InputMethodBase : public InputMethod,
                                      public FocusChangeListener {
  public:
@@ skipping 14 matching lines @@
 
   // If a derived class overrides this method, it should call parent's
   // implementation first, to make sure |widget_focused_| flag can be updated
   // correctly.
   virtual void OnBlur() OVERRIDE;
 
   // If a derived class overrides this method, it should call parent's
   // implementation.
   virtual void OnTextInputTypeChanged(View* view) OVERRIDE;
 
-  virtual ui::TextInputClient* GetTextInputClient() const OVERRIDE;
+  virtual TextInputClient* GetTextInputClient() const OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual bool IsMock() const OVERRIDE;
 
   // Overridden from FocusChangeListener.
   virtual void OnWillChangeFocus(View* focused_before, View* focused) OVERRIDE;
   virtual void OnDidChangeFocus(View* focused_before, View* focused) OVERRIDE;
 
  protected:
   // Getters and setters of properties.
   internal::InputMethodDelegate* delegate() const { return delegate_; }
@@ skipping 28 matching lines @@
 
   // Indicates if the top-level widget is focused or not.
   bool widget_focused_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodBase);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_IME_INPUT_METHOD_BASE_H_