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

chrome/browser/renderer_host/render_widget_host_view_views.cc

 // 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.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 666 matching lines @@
   wmwe.button = WebKit::WebMouseEvent::ButtonNone;
 
   // TODO(sadrul): How do we determine if it's a horizontal scroll?
   wmwe.deltaY = event.offset();
   wmwe.wheelTicksY = wmwe.deltaY > 0 ? 1 : -1;
 
   host_->ForwardWheelEvent(wmwe);
   return true;
 }
 
-ui::TextInputClient* RenderWidgetHostViewViews::GetTextInputClient() {
+views::TextInputClient* RenderWidgetHostViewViews::GetTextInputClient() {
   return this;
 }
 
 bool RenderWidgetHostViewViews::GetTooltipText(const gfx::Point& p,
                                                string16* tooltip) const {
   if (tooltip_text_.length() == 0)
     return false;
   *tooltip = tooltip_text_;
   return true;
 }
 
-// ui::TextInputClient implementation -----------------------------------------
+// TextInputClient implementation ---------------------------------------------
 void RenderWidgetHostViewViews::SetCompositionText(
     const ui::CompositionText& composition) {
   if (!host_)
     return;
 
   // ui::CompositionUnderline should be identical to
   // WebKit::WebCompositionUnderline, so that we can do reinterpret_cast safely.
   COMPILE_ASSERT(sizeof(ui::CompositionUnderline) ==
                  sizeof(WebKit::WebCompositionUnderline),
                  ui_CompositionUnderline__WebKit_WebCompositionUnderline_diff);
@@ skipping 120 matching lines @@
   if (!host_)
     return false;
   host_->UpdateTextDirection(
       direction == base::i18n::RIGHT_TO_LEFT ?
       WebKit::WebTextDirectionRightToLeft :
       WebKit::WebTextDirectionLeftToRight);
   host_->NotifyTextDirection();
   return true;
 }
 
+views::View* RenderWidgetHostViewViews::GetOwnerViewOfTextInputClient() {
+  return this;
+}
+
 void RenderWidgetHostViewViews::OnPaint(gfx::Canvas* canvas) {
   if (is_hidden_ || !host_)
     return;
 
   DCHECK(!host_->is_accelerated_compositing_active() ||
          get_use_acceleration_when_possible());
 
   // If we aren't using the views compositor, then
   // paint a "hole" in the canvas so that the render of the web page is on
   // top of whatever else has already been painted in the views hierarchy.
@@ skipping 316 matching lines @@
   for (std::vector< base::Callback<void(void)> >::const_iterator
       it = on_compositing_ended_callbacks_.begin();
       it != on_compositing_ended_callbacks_.end(); ++it) {
     it->Run();
   }
   on_compositing_ended_callbacks_.clear();
   compositor->RemoveObserver(this);
 }
 
 #endif