Make HWNDMessageHandler build with use_aura==1

ui/views/widget/native_widget_win.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/widget/native_widget_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 231 matching lines @@
 
 void NativeWidgetWin::ReleaseCapture() {
   message_handler_->ReleaseCapture();
 }
 
 bool NativeWidgetWin::HasCapture() const {
   return message_handler_->HasCapture();
 }
 
 InputMethod* NativeWidgetWin::CreateInputMethod() {
-  return message_handler_->CreateInputMethod();
+#if !defined(USE_AURA)
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (!command_line->HasSwitch(switches::kEnableViewsTextfield))
+    return NULL;
+#endif
+  return new InputMethodWin(GetMessageHandler());
 }
 
 internal::InputMethodDelegate* NativeWidgetWin::GetInputMethodDelegate() {
   return message_handler_.get();
 }
 
 void NativeWidgetWin::CenterWindow(const gfx::Size& size) {
   message_handler_->CenterWindow(size);
 }
 
@@ skipping 200 matching lines @@
 
 void NativeWidgetWin::ClearNativeFocus() {
   message_handler_->ClearNativeFocus();
 }
 
 void NativeWidgetWin::FocusNativeView(gfx::NativeView native_view) {
   message_handler_->FocusHWND(native_view);
 }
 
 gfx::Rect NativeWidgetWin::GetWorkAreaBoundsInScreen() const {
-  return message_handler_->GetWorkAreaBoundsInScreen();
+  return gfx::Screen::GetDisplayNearestWindow(GetNativeView()).work_area();
 }
 
 void NativeWidgetWin::SetInactiveRenderingDisabled(bool value) {
 }
 
 Widget::MoveLoopResult NativeWidgetWin::RunMoveLoop(
     const gfx::Point& drag_offset) {
   return message_handler_->RunMoveLoop(drag_offset) ?
       Widget::MOVE_LOOP_SUCCESSFUL : Widget::MOVE_LOOP_CANCELED;
 }
@@ skipping 255 matching lines @@
 void NativeWidgetWin::HandleClientSizeChanged(const gfx::Size& new_size) {
   delegate_->OnNativeWidgetSizeChanged(new_size);
 }
 
 void NativeWidgetWin::HandleFrameChanged() {
   GetWidget()->non_client_view()->UpdateFrame();
 }
 
 void NativeWidgetWin::HandleNativeFocus(HWND last_focused_window) {
   delegate_->OnNativeFocus(last_focused_window);
+  InputMethod* input_method = GetInputMethod();
+  if (input_method)
+    input_method->OnFocus();
 }
 
 void NativeWidgetWin::HandleNativeBlur(HWND focused_window) {
   delegate_->OnNativeBlur(focused_window);
+  InputMethod* input_method = GetInputMethod();
+  if (input_method)
+    input_method->OnBlur();
 }
 
 bool NativeWidgetWin::HandleMouseEvent(const ui::MouseEvent& event) {
   return delegate_->OnMouseEvent(event);
 }
 
 bool NativeWidgetWin::HandleKeyEvent(const ui::KeyEvent& event) {
   return delegate_->OnKeyEvent(event);
 }
 
+bool NativeWidgetWin::HandleUntranslatedKeyEvent(const ui::KeyEvent& event) {
+  InputMethod* input_method = GetInputMethod();
+  if (input_method)
+    input_method->DispatchKeyEvent(event);
+  return !!input_method;
+}
+
+bool NativeWidgetWin::HandleIMEMessage(UINT message,
+                                       WPARAM w_param,
+                                       LPARAM l_param,
+                                       LRESULT* result) {
+  InputMethod* input_method = GetInputMethod();
+  if (!input_method || input_method->IsMock()) {
+    *result = 0;
+    return false;
+  }
+
+  InputMethodWin* ime_win = static_cast<InputMethodWin*>(input_method);
+  BOOL handled = FALSE;
+  *result = ime_win->OnImeMessages(message, w_param, l_param, &handled);
+  return !!handled;
+}
+
+void NativeWidgetWin::HandleInputLanguageChange(DWORD character_set,
+                                                HKL input_language_id) {
+  InputMethod* input_method = GetInputMethod();
+  if (input_method && !input_method->IsMock()) {
+    static_cast<InputMethodWin*>(input_method)->OnInputLangChange(
+        character_set, input_language_id);
+  }
+}
+
 bool NativeWidgetWin::HandlePaintAccelerated(const gfx::Rect& invalid_rect) {
   return delegate_->OnNativeWidgetPaintAccelerated(gfx::Rect(invalid_rect));
 }
 
 void NativeWidgetWin::HandlePaint(gfx::Canvas* canvas) {
   delegate_->OnNativeWidgetPaint(canvas);
 }
 
 void NativeWidgetWin::HandleScreenReaderDetected() {
   // TODO(beng): just consolidate this with OnScreenReaderDetected.
@@ skipping 289 matching lines @@
 // static
 bool NativeWidgetPrivate::IsTouchDown() {
   // This currently isn't necessary because we're not generating touch events on
   // windows.  When we do, this will need to be updated.
   return false;
 }
 
 }  // namespace internal
 
 }  // namespace views