Remove the 2-level input method system & InputMethodBridge.

ui/views/focus/focus_manager.cc

 // Copyright (c) 2012 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 "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 430 matching lines @@
 
 void FocusManager::ClearStoredFocusedView() {
   SetStoredFocusView(NULL);
 }
 
 void FocusManager::OnTextInputClientChanged(View* view) {
   if (view == focused_view_)
     FocusTextInputClient(view);
 }
 
 void FocusManager::FocusTextInputClient(View* view) {

[James Su, 2015/06/12 07:58:50]

IMHO, everything related to TextInputClient in this class should be removed.

[Shu Chen, 2015/06/12 08:51:31]

Removing GetTextInputClient stuff should be done in a separated CL of removing
the whole TextInputFocusManager stuff.

   if (!switches::IsTextInputFocusManagerEnabled())
     return;
 
   // If the widget is not active, do not steal the text input focus.
   if (!widget_->IsActive())
     return;
 
   ui::TextInputClient* text_input_client =
       view ? view->GetTextInputClient() : NULL;
   ui::TextInputFocusManager::GetInstance()->
       FocusTextInputClient(text_input_client);
-  ui::InputMethod* input_method = widget_->GetHostInputMethod();
+  ui::InputMethod* input_method = widget_->GetInputMethod();
   if (input_method) {
     input_method->OnTextInputTypeChanged(text_input_client);
     input_method->OnCaretBoundsChanged(text_input_client);
   }
 }
 
 void FocusManager::BlurTextInputClient(View* view) {
   if (!switches::IsTextInputFocusManagerEnabled())
     return;
 
   ui::TextInputClient* text_input_client =
       view ? view->GetTextInputClient() : NULL;
   if (text_input_client && text_input_client->HasCompositionText()) {
     text_input_client->ConfirmCompositionText();
-    ui::InputMethod* input_method = widget_->GetHostInputMethod();
+    ui::InputMethod* input_method = widget_->GetInputMethod();
     if (input_method && input_method->GetTextInputClient() == text_input_client)
       input_method->CancelComposition(text_input_client);
   }
   ui::TextInputFocusManager::GetInstance()->
       BlurTextInputClient(text_input_client);
 }
 
 // Find the next (previous if reverse is true) focusable view for the specified
 // FocusTraversable, starting at the specified view, traversing down the
 // FocusTraversable hierarchy.
@@ skipping 98 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views