BASELINE: Update Chromium to 51.0.2704.41

Also adds in all smaller components by reversing logic for exclusion.

Change-Id: Ibf90b506e7da088ea2f65dcf23f2b0992c504422
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/chromium/ui/base/ime/input_method_win.h b/chromium/ui/base/ime/input_method_win.h
index ce411491e23..742085445e3 100644
--- a/chromium/ui/base/ime/input_method_win.h
+++ b/chromium/ui/base/ime/input_method_win.h
@@ -21,10 +21,9 @@ 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;
   void DispatchKeyEvent(ui::KeyEvent* event) override;
@@ -101,6 +100,11 @@ class UI_BASE_IME_EXPORT InputMethodWin : public InputMethodBase {
   // Enables or disables the IME according to the current text input type.
   void UpdateIMEState();
 
+  // Callback function for IMEEngineHandlerInterface::ProcessKeyEvent.
+  void ProcessKeyEventDone(ui::KeyEvent* event,
+                           const std::vector<MSG>* char_msgs,
+                           bool is_handled);
+
   // Windows IMM32 wrapper.
   // (See "ui/base/ime/win/ime_input.h" for its details.)
   ui::IMM32Manager imm32_manager_;
@@ -130,6 +134,9 @@ class UI_BASE_IME_EXPORT InputMethodWin : public InputMethodBase {
   // composition.
   HWND composing_window_handle_;
 
+  // Used for making callbacks.
+  base::WeakPtrFactory<InputMethodWin> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(InputMethodWin);
 };