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

chrome/browser/renderer_host/render_widget_host_view_views.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 CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_
 #pragma once
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/task.h"
 #include "base/time.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
-#include "ui/base/ime/text_input_client.h"
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/events/event.h"
+#include "views/ime/text_input_client.h"
 #include "views/touchui/touch_selection_controller.h"
 #include "views/view.h"
 #include "webkit/glue/webcursor.h"
 
 #if defined(TOUCH_UI)
 namespace ui {
 enum TouchStatus;
 }
 #endif
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 class AcceleratedSurfaceContainerLinux;
 #endif
 
 class RenderWidgetHost;
 struct NativeWebKeyboardEvent;
 
 // -----------------------------------------------------------------------------
 // See comments in render_widget_host_view.h about this class and its members.
 // -----------------------------------------------------------------------------
 class RenderWidgetHostViewViews : public RenderWidgetHostView,
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
                                   public ui::CompositorObserver,
 #endif
                                   public views::TouchSelectionClientView,
-                                  public ui::TextInputClient,
+                                  public views::TextInputClient,
                                   public content::NotificationObserver {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
   explicit RenderWidgetHostViewViews(RenderWidgetHost* widget);
   virtual ~RenderWidgetHostViewViews();
 
   // Initialize this object for use as a drawing area.
   void InitAsChild();
@@ skipping 87 matching lines @@
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseMoved(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE;
 #if defined(TOUCH_UI)
   virtual ui::TouchStatus OnTouchEvent(const views::TouchEvent& event) OVERRIDE;
 #endif
   virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
   virtual bool OnKeyReleased(const views::KeyEvent& event) OVERRIDE;
   virtual bool OnMouseWheel(const views::MouseWheelEvent& event) OVERRIDE;
-  virtual ui::TextInputClient* GetTextInputClient() OVERRIDE;
+  virtual views::TextInputClient* GetTextInputClient() OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE;
 
-  // Overridden from ui::TextInputClient:
+  // Overridden from TextInputClient:
   virtual void SetCompositionText(
       const ui::CompositionText& composition) OVERRIDE;
   virtual void ConfirmCompositionText() OVERRIDE;
   virtual void ClearCompositionText() OVERRIDE;
   virtual void InsertText(const string16& text) OVERRIDE;
   virtual void InsertChar(char16 ch, int flags) OVERRIDE;
   virtual ui::TextInputType GetTextInputType() const OVERRIDE;
   virtual gfx::Rect GetCaretBounds() OVERRIDE;
   virtual bool HasCompositionText() OVERRIDE;
   virtual bool GetTextRange(ui::Range* range) OVERRIDE;
   virtual bool GetCompositionTextRange(ui::Range* range) OVERRIDE;
   virtual bool GetSelectionRange(ui::Range* range) OVERRIDE;
   virtual bool SetSelectionRange(const ui::Range& range) OVERRIDE;
   virtual bool DeleteRange(const ui::Range& range) OVERRIDE;
   virtual bool GetTextFromRange(const ui::Range& range,
                                 string16* text) OVERRIDE;
   virtual void OnInputMethodChanged() OVERRIDE;
   virtual bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) OVERRIDE;
+  virtual views::View* GetOwnerViewOfTextInputClient() OVERRIDE;
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   virtual void AcceleratedSurfaceNew(
       int32 width,
       int32 height,
       uint64* surface_id,
       TransportDIB::Handle* surface_handle) OVERRIDE;
   virtual void AcceleratedSurfaceBuffersSwapped(
       uint64 surface_id,
       int32 route_id,
@@ skipping 118 matching lines @@
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
   std::map<uint64, scoped_refptr<AcceleratedSurfaceContainerLinux> >
       accelerated_surface_containers_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewViews);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_VIEWS_H_