Refactoring for the InputMethod & InputMethodDelegate interfaces.

ui/base/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 UI_BASE_IME_INPUT_METHOD_WIN_H_
 #define UI_BASE_IME_INPUT_METHOD_WIN_H_
 
 #include <windows.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/base/ime/input_method_base.h"
 #include "ui/base/ime/win/imm32_manager.h"
 
 namespace ui {
 
 // A common InputMethod implementation based on IMM32.
 class UI_BASE_IME_EXPORT InputMethodWin : public InputMethodBase {
  public:
   InputMethodWin(internal::InputMethodDelegate* delegate,
                  HWND toplevel_window_handle);
-  ~InputMethodWin() override;
 
   // Overridden from InputMethod:
   void OnFocus() override;
   void OnBlur() override;
   bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
                                 NativeEventResult* result) override;
-  bool DispatchKeyEvent(const ui::KeyEvent& event) override;
+  void DispatchKeyEvent(ui::KeyEvent* event) override;
   void OnTextInputTypeChanged(const TextInputClient* client) override;
   void OnCaretBoundsChanged(const TextInputClient* client) override;
   void CancelComposition(const TextInputClient* client) override;
   void OnInputLocaleChanged() override;
   std::string GetInputLocale() override;
   bool IsCandidatePopupOpen() const override;
 
  protected:
   // Overridden from InputMethodBase:
   // If a derived class overrides this method, it should call parent's
@@ skipping 44 matching lines @@
                        LPARAM lparam,
                        BOOL* handled);
   LRESULT OnDocumentFeed(RECONVERTSTRING* reconv);
   LRESULT OnReconvertString(RECONVERTSTRING* reconv);
   LRESULT OnQueryCharPosition(IMECHARPOSITION* char_positon);
 
   // Returns true if the Win32 native window bound to |client| is considered
   // to be ready for receiving keyboard input.
   bool IsWindowFocused(const TextInputClient* client) const;
 
-  bool DispatchFabricatedKeyEvent(const ui::KeyEvent& event);
+  void DispatchFabricatedKeyEvent(ui::KeyEvent* event);
 
   // Asks the client to confirm current composition text.
   void ConfirmCompositionText();
 
   // Enables or disables the IME according to the current text input type.
   void UpdateIMEState();
 
   // Windows IMM32 wrapper.
   // (See "ui/base/ime/win/ime_input.h" for its details.)
   ui::IMM32Manager imm32_manager_;
@@ skipping 20 matching lines @@
   bool is_candidate_popup_open_;
 
   // Window handle where composition is on-going. NULL when there is no
   // composition.
   HWND composing_window_handle_;
 
   // Set to true to suppress the next WM_CHAR, when the WM_KEYDOWN gets stopped
   // propagation (e.g. triggered an accelerator).
   bool suppress_next_char_;
 
-  // The pointer to a boolean value which indicates whether this InputMethod
-  // instance is destroyed. This is used in DispatchKeyEvent to detect whether
-  // DispatchKeyEventPostIME will cause destruction of this InputMethod
-  // instance. See crbug.com/513917.
-  bool* destroyed_ptr_;
-
   DISALLOW_COPY_AND_ASSIGN(InputMethodWin);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_IME_INPUT_METHOD_WIN_H_