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

views/ime/input_method_gtk.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 "views/ime/input_method_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 191 matching lines @@
 void InputMethodGtk::OnDidChangeFocus(View* focused_before, View* focused) {
   UpdateContextFocusState();
 
   // Force to update caret bounds, in case the View thinks that the caret
   // bounds has not changed.
   if (context_focused_)
     OnCaretBoundsChanged(GetFocusedView());
 }
 
 void InputMethodGtk::ConfirmCompositionText() {
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   if (client && client->HasCompositionText())
     client->ConfirmCompositionText();
 
   ResetContext();
 }
 
 void InputMethodGtk::ResetContext() {
   if (!GetTextInputClient())
     return;
 
@@ skipping 67 matching lines @@
   // change.
   if (old_focused_view != GetFocusedView())
     return;
 
   // If a key event was not filtered by |context_| or |context_simple_|, then
   // it means the key event didn't generate any result text. For some cases,
   // the key event may still generate a valid character, eg. a control-key
   // event (ctrl-a, return, tab, etc.). We need to send the character to the
   // focused text input client by calling TextInputClient::InsertChar().
   char16 ch = key.GetCharacter();
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   if (ch && client)
     client->InsertChar(ch, key.flags());
 }
 
 void InputMethodGtk::ProcessInputMethodResult(const KeyEvent& key,
                                               bool filtered) {
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   DCHECK(client);
 
   if (result_text_.length()) {
     if (filtered && NeedInsertChar()) {
       for (string16::const_iterator i = result_text_.begin();
            i != result_text_.end(); ++i) {
         client->InsertChar(*i, key.flags());
       }
     } else {
       client->InsertText(result_text_);
@@ skipping 102 matching lines @@
 }
 
 void InputMethodGtk::OnPreeditEnd(GtkIMContext* context) {
   if (composition_.text.empty() || IsTextInputTypeNone())
     return;
 
   composition_changed_ = true;
   composition_.Clear();
 
   if (!handling_key_event_) {
-    ui::TextInputClient* client = GetTextInputClient();
+    TextInputClient* client = GetTextInputClient();
     if (client && client->HasCompositionText())
       client->ClearCompositionText();
   }
 }
 
 void InputMethodGtk::OnWidgetRealize(GtkWidget* widget) {
   // We should only set im context's client window once, because when setting
   // client window, im context may destroy and recreate its internal states and
   // objects.
   if (widget->window) {
     gtk_im_context_set_client_window(context_, widget->window);
     gtk_im_context_set_client_window(context_simple_, widget->window);
   }
 }
 
 void InputMethodGtk::OnWidgetUnrealize(GtkWidget* widget) {
   gtk_im_context_set_client_window(context_, NULL);
   gtk_im_context_set_client_window(context_simple_, NULL);
 }
 
 }  // namespace views