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

chrome/browser/renderer_host/render_widget_host_view_views.cc

Index: chrome/browser/renderer_host/render_widget_host_view_views.cc
===================================================================
--- chrome/browser/renderer_host/render_widget_host_view_views.cc	(revision 109585)
+++ chrome/browser/renderer_host/render_widget_host_view_views.cc	(working copy)
@@ -684,7 +684,7 @@
   return true;
 }
 
-ui::TextInputClient* RenderWidgetHostViewViews::GetTextInputClient() {
+views::TextInputClient* RenderWidgetHostViewViews::GetTextInputClient() {
   return this;
 }
 
@@ -696,7 +696,7 @@
   return true;
 }
 
-// ui::TextInputClient implementation -----------------------------------------
+// TextInputClient implementation ---------------------------------------------
 void RenderWidgetHostViewViews::SetCompositionText(
     const ui::CompositionText& composition) {
   if (!host_)
@@ -837,6 +837,10 @@
   return true;
 }
 
+views::View* RenderWidgetHostViewViews::GetOwnerViewOfTextInputClient() {
+  return this;
+}
+
 void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) {
   if (is_hidden_ || !host_)
     return;
Property changes on: chrome/browser/renderer_host/render_widget_host_view_views.cc
___________________________________________________________________
Deleted: svn:mergeinfo