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

views/ime/input_method_win.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_win.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "ui/base/ime/composition_text.h"
-#include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "views/events/event.h"
 
 // Extra number of chars before and after selection (or composition) range which
 // is returned to IME for improving conversion accuracy.
 static const size_t kExtraNumberOfChars = 20;
 
 namespace views {
 
 InputMethodWin::InputMethodWin(internal::InputMethodDelegate* delegate)
@@ skipping 258 matching lines @@
   ui::CompositionText composition;
   composition.text.assign(1, static_cast<char16>(wparam));
   composition.selection = ui::Range(0, 1);
   composition.underlines.push_back(
       ui::CompositionUnderline(0, 1, SK_ColorBLACK, false));
   GetTextInputClient()->SetCompositionText(composition);
   return 0;
 }
 
 LRESULT InputMethodWin::OnDocumentFeed(RECONVERTSTRING* reconv) {
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   if (!client)
     return 0;
 
   ui::Range text_range;
   if (!client->GetTextRange(&text_range) || text_range.is_empty())
     return 0;
 
   bool result = false;
   ui::Range target_range;
   if (client->HasCompositionText())
@@ skipping 42 matching lines @@
   memcpy((char*)reconv + sizeof(RECONVERTSTRING),
          text.c_str(), len * sizeof(WCHAR));
 
   // According to Microsft API document, IMR_RECONVERTSTRING and
   // IMR_DOCUMENTFEED should return reconv, but some applications return
   // need_size.
   return reinterpret_cast<LRESULT>(reconv);
 }
 
 LRESULT InputMethodWin::OnReconvertString(RECONVERTSTRING* reconv) {
-  ui::TextInputClient* client = GetTextInputClient();
+  TextInputClient* client = GetTextInputClient();
   if (!client)
     return 0;
 
   // If there is a composition string already, we don't allow reconversion.
   if (client->HasCompositionText())
     return 0;
 
   ui::Range text_range;
   if (!client->GetTextRange(&text_range) || text_range.is_empty())
     return 0;
@@ skipping 58 matching lines @@
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       ime_input_.DisableIME(hwnd());
       break;
     default:
       ime_input_.EnableIME(hwnd());
       break;
   }
 }
 
 }  // namespace views