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

views/ime/input_method_ibus.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_ibus.h"
 
 #include <ibus.h>
 #if defined(TOUCH_UI)
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ skipping 578 matching lines @@
     // CreateInputContextDone().
     pending_create_fake_ic_request_->abandon();
     pending_create_fake_ic_request_ = NULL;
   } else if (fake_context_) {
     ibus_proxy_destroy(reinterpret_cast<IBusProxy *>(fake_context_));
     DCHECK(!fake_context_);
   }
 }
 
 void InputMethodIBus::ConfirmCompositionText() {
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   if (client && client->HasCompositionText())
     client->ConfirmCompositionText();
 
   ResetContext();
 }
 
 void InputMethodIBus::ResetContext() {
   if (!context_focused_ || !GetTextInputClient())
     return;
 
@@ skipping 127 matching lines @@
 
   // We shouldn't dispatch the character anymore if the key event caused focus
   // change.
   if (old_focused_view != GetFocusedView())
     return;
 
   // Process compose and dead keys
   if (character_composer_.FilterKeyPress(ibus_keyval)) {
     string16 composed = character_composer_.composed_character();
     if (!composed.empty()) {
-      ui::TextInputClient* client = GetTextInputClient();
+      TextInputClient* client = GetTextInputClient();
       if (client)
         client->InsertText(composed);
     }
     return;
   }
   // If a key event was not filtered by |context_| and |character_composer_|,
   // then it means the key event didn't generate any result text. So we need
   // to send corresponding character to the focused text input client.
 
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   char16 ch = key.GetCharacter();
   if (ch && client)
     client->InsertChar(ch, key.flags());
 }
 
 void InputMethodIBus::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 156 matching lines @@
 void InputMethodIBus::OnHidePreeditText(IBusInputContext* context) {
   DCHECK_EQ(context_, context);
   if (composition_.text.empty() || IsTextInputTypeNone())
     return;
 
   // Intentionally leaves |composing_text_| unchanged.
   composition_changed_ = true;
   composition_.Clear();
 
   if (pending_key_events_.empty()) {
-    ui::TextInputClient* client = GetTextInputClient();
+    TextInputClient* client = GetTextInputClient();
     if (client && client->HasCompositionText())
       client->ClearCompositionText();
     composition_changed_ = false;
   }
 }
 
 void InputMethodIBus::OnDestroy(IBusInputContext* context) {
   DCHECK_EQ(context_, context);
   g_object_unref(context_);
   context_ = NULL;
@@ skipping 65 matching lines @@
   DCHECK_EQ(GetIBus(), bus);
   DCHECK(data);
   IBusInputContext* ic =
       ibus_bus_create_input_context_async_finish(bus, res, NULL);
   if (ic)
     data->StoreOrAbandonInputContext(ic);
   delete data;
 }
 
 }  // namespace views