Support IMM32 reconversion on Windows

views/ime/input_method_win.h

 // Copyright (c) 2011 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.
 
 #ifndef VIEWS_IME_INPUT_METHOD_WIN_H_
 #define VIEWS_IME_INPUT_METHOD_WIN_H_
 #pragma once
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/win/ime_input.h"
 #include "views/ime/input_method_base.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
+namespace ui {
+class Range;
+};

[James Su, 2011/10/25 19:15:03]

This forward declaration is not necessary.

[Peng, 2011/10/25 22:01:21]

Done.

+
 namespace views {
 
 // An InputMethod implementation based on Windows IMM32 API.
 class InputMethodWin : public InputMethodBase {
  public:
   explicit InputMethodWin(internal::InputMethodDelegate* delegate);
   virtual ~InputMethodWin();
 
   // Overridden from InputMethod:
   virtual void Init(Widget* widget) OVERRIDE;
@@ skipping 17 matching lines @@
 
  private:
   LRESULT OnImeSetContext(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
   LRESULT OnImeStartComposition(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
   LRESULT OnImeComposition(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
   LRESULT OnImeEndComposition(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
+  LRESULT OnImeRequest(
+      UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
   // For both WM_CHAR and WM_SYSCHAR
   LRESULT OnChar(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
   // For both WM_DEADCHAR and WM_SYSDEADCHAR
   LRESULT OnDeadChar(
       UINT message, WPARAM wparam, LPARAM lparam, BOOL* handled);
 
+  LRESULT OnReconvertString(RECONVERTSTRING *reconv);
+  LRESULT OnDocumentFeed(RECONVERTSTRING *reconv);
 
   // Overridden from InputMethodBase.
   virtual void FocusedViewWillChange() OVERRIDE;
   virtual void FocusedViewDidChange() OVERRIDE;
 
   // A helper function to return the Widget's native window.
   HWND hwnd() const { return widget()->GetNativeView(); }
 
   // Asks the client to confirm current composition text.
   void ConfirmCompositionText();
@@ skipping 18 matching lines @@
   // Windows IMM32 wrapper.
   // (See "ui/base/win/ime_input.h" for its details.)
   ui::ImeInput ime_input_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodWin);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_IME_INPUT_METHOD_WIN_H_