Remove the 2-level input method system & InputMethodBridge.

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/ime/input_method.h"
 #include "ui/compositor/clip_transform_recorder.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/paint_context.h"
 #include "ui/compositor/paint_recorder.h"
 #include "ui/events/event_target_iterator.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ skipping 977 matching lines @@
 }
 
 void View::OnTouchEvent(ui::TouchEvent* event) {
   NOTREACHED() << "Views should not receive touch events.";
 }
 
 void View::OnGestureEvent(ui::GestureEvent* event) {
 }
 
 ui::TextInputClient* View::GetTextInputClient() {
-  return NULL;
+  return nullptr;
 }
 
-InputMethod* View::GetInputMethod() {
+ui::InputMethod* View::GetInputMethod() {
   Widget* widget = GetWidget();
-  return widget ? widget->GetInputMethod() : NULL;
+  return widget ? widget->GetInputMethod() : nullptr;
 }
 
-const InputMethod* View::GetInputMethod() const {
-  const Widget* widget = GetWidget();
-  return widget ? widget->GetInputMethod() : NULL;
+const ui::InputMethod* View::GetInputMethod() const {
+  Widget* widget = const_cast<Widget*>(GetWidget());
+  return widget ? const_cast<const ui::InputMethod*>(widget->GetInputMethod())
+                : nullptr;
 }
 
 scoped_ptr<ViewTargeter>
 View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) {
   scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass();
   targeter_ = targeter.Pass();
   return old_targeter.Pass();
 }
 
 ViewTargeter* View::GetEffectiveViewTargeter() const {
@@ skipping 1327 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views