Index: ui/views/view.cc |
diff --git a/ui/views/view.cc b/ui/views/view.cc |
index 8dded154610496f188c9cd32c729e642fcb7c695..2f55dfd000649a20a44d17035f98db3b06167761 100644 |
--- a/ui/views/view.cc |
+++ b/ui/views/view.cc |
@@ -19,6 +19,7 @@ |
#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" |
@@ -1016,17 +1017,18 @@ 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> |