| Index: ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
| diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
| index 0807934dbf915d60348559e88bf0fdcc5b9b5aae..e11a2670bdb3246d2c7e2148a2efe3b3d4dc5108 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
| +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
|
| @@ -37,7 +37,6 @@
|
| #include "ui/views/win/fullscreen_handler.h"
|
| #include "ui/views/win/hwnd_message_handler.h"
|
| #include "ui/wm/core/compound_event_filter.h"
|
| -#include "ui/wm/core/input_method_event_filter.h"
|
| #include "ui/wm/core/window_animations.h"
|
| #include "ui/wm/public/scoped_tooltip_disabler.h"
|
|
|
| @@ -553,13 +552,6 @@ void DesktopWindowTreeHostWin::MoveCursorToNative(const gfx::Point& location) {
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// DesktopWindowTreeHostWin, ui::EventSource implementation:
|
| -
|
| -ui::EventProcessor* DesktopWindowTreeHostWin::GetEventProcessor() {
|
| - return dispatcher();
|
| -}
|
| -
|
| -////////////////////////////////////////////////////////////////////////////////
|
| // DesktopWindowTreeHostWin, aura::AnimationHost implementation:
|
|
|
| void DesktopWindowTreeHostWin::SetHostTransitionOffsets(
|
| @@ -679,10 +671,6 @@ gfx::NativeViewAccessible DesktopWindowTreeHostWin::GetNativeViewAccessible() {
|
| return GetWidget()->GetRootView()->GetNativeViewAccessible();
|
| }
|
|
|
| -InputMethod* DesktopWindowTreeHostWin::GetInputMethod() {
|
| - return GetWidget()->GetInputMethodDirect();
|
| -}
|
| -
|
| bool DesktopWindowTreeHostWin::ShouldHandleSystemCommands() const {
|
| return GetWidget()->widget_delegate()->ShouldHandleSystemCommands();
|
| }
|
| @@ -856,15 +844,13 @@ bool DesktopWindowTreeHostWin::HandleIMEMessage(UINT message,
|
| msg.message = message;
|
| msg.wParam = w_param;
|
| msg.lParam = l_param;
|
| - return desktop_native_widget_aura_->input_method_event_filter()->
|
| - input_method()->OnUntranslatedIMEMessage(msg, result);
|
| + return GetInputMethod()->OnUntranslatedIMEMessage(msg, result);
|
| }
|
|
|
| void DesktopWindowTreeHostWin::HandleInputLanguageChange(
|
| DWORD character_set,
|
| HKL input_language_id) {
|
| - desktop_native_widget_aura_->input_method_event_filter()->
|
| - input_method()->OnInputLocaleChanged();
|
| + GetInputMethod()->OnInputLocaleChanged();
|
| }
|
|
|
| void DesktopWindowTreeHostWin::HandlePaintAccelerated(
|
|
|