Unify InputMethodIMM32 into InputMethodWin again

ui/base/ime/input_method_imm32.h

Index: ui/base/ime/input_method_imm32.h
diff --git a/ui/base/ime/input_method_imm32.h b/ui/base/ime/input_method_imm32.h
deleted file mode 100644
index 435a5eb94fb83d8905e4c35559771d5b8c51aa5c..0000000000000000000000000000000000000000
--- a/ui/base/ime/input_method_imm32.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2013 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 UI_BASE_IME_INPUT_METHOD_IMM32_H_
-#define UI_BASE_IME_INPUT_METHOD_IMM32_H_
-
-#include <windows.h>
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "ui/base/ime/input_method_win.h"
-
-namespace ui {
-
-// An InputMethod implementation based on Windows IMM32 API.
-class UI_BASE_EXPORT InputMethodIMM32 : public InputMethodWin {
- public:
-  InputMethodIMM32(internal::InputMethodDelegate* delegate,
-                   HWND toplevel_window_handle);
-
-  // Overridden from InputMethod:
-  virtual void OnFocus() OVERRIDE;
-  virtual void OnBlur() OVERRIDE;
-  virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
-                                        NativeEventResult* result) OVERRIDE;
-  virtual void OnTextInputTypeChanged(const TextInputClient* client) OVERRIDE;
-  virtual void OnCaretBoundsChanged(const TextInputClient* client) OVERRIDE;
-  virtual void CancelComposition(const TextInputClient* client) OVERRIDE;
-  virtual bool IsCandidatePopupOpen() const OVERRIDE;
-
- protected:
-  // Overridden from InputMethodBase:
-  virtual void OnWillChangeFocusedClient(TextInputClient* focused_before,
-                                         TextInputClient* focused) OVERRIDE;
-  virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
-                                        TextInputClient* focused) OVERRIDE;
-
- private:
-  LRESULT OnImeSetContext(HWND window_handle,
-                          UINT message,
-                          WPARAM wparam,
-                          LPARAM lparam,
-                          BOOL* handled);
-  LRESULT OnImeStartComposition(HWND window_handle,
-                                UINT message,
-                                WPARAM wparam,
-                                LPARAM lparam,
-                                BOOL* handled);
-  LRESULT OnImeComposition(HWND window_handle,
-                           UINT message,
-                           WPARAM wparam,
-                           LPARAM lparam,
-                           BOOL* handled);
-  LRESULT OnImeEndComposition(HWND window_handle,
-                              UINT message,
-                              WPARAM wparam,
-                              LPARAM lparam,
-                              BOOL* handled);
-  LRESULT OnImeNotify(UINT message,
-                      WPARAM wparam,
-                      LPARAM lparam,
-                      BOOL* handled);
-
-  // Asks the client to confirm current composition text.
-  void ConfirmCompositionText();
-
-  // Enables or disables the IME according to the current text input type.
-  void UpdateIMEState();
-
-  bool enabled_;
-
-  // True if we know for sure that a candidate window is open.
-  bool is_candidate_popup_open_;
-
-  // Window handle where composition is on-going. NULL when there is no
-  // composition.
-  HWND composing_window_handle_;
-
-  DISALLOW_COPY_AND_ASSIGN(InputMethodIMM32);
-};
-
-}  // namespace ui
-
-#endif  // UI_BASE_IME_INPUT_METHOD_IMM32_H_