Fix handling of rewritten-Alt + Button1 -> Button3.

chrome/browser/chromeos/events/event_rewriter.h

 // Copyright 2014 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 CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 #define CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 129 matching lines @@
 
   // Given a set of KeyboardRemapping structs, it finds a matching struct
   // if possible, and updates the remapped event values. Returns true if a
   // remapping was found and remapped values were updated.
   bool RewriteWithKeyboardRemappingsByKeyCode(
       const KeyboardRemapping* remappings,
       size_t num_remappings,
       const MutableKeyState& input,
       MutableKeyState* remapped_state);
 
+  // Rewrite a particular kind of event.

[kpschoedel, 2014/05/12 21:58:03]

Split these out of |RewriteEvent()| as in the sticky CL because the function was
getting long.

+  ui::EventRewriteStatus RewriteKeyEvent(
+      const ui::KeyEvent& key_event,
+      scoped_ptr<ui::Event>* rewritten_event);
+  ui::EventRewriteStatus RewriteMouseEvent(
+      const ui::MouseEvent& mouse_event,
+      scoped_ptr<ui::Event>* rewritten_event);
+  ui::EventRewriteStatus RewriteTouchEvent(
+      const ui::TouchEvent& touch_event,
+      scoped_ptr<ui::Event>* rewritten_event);
+
   // Rewriter phases. These can inspect the original |event|, but operate using
   // the current |state|, which may have been modified by previous phases.
   void RewriteModifierKeys(const ui::KeyEvent& event, MutableKeyState* state);
   void RewriteNumPadKeys(const ui::KeyEvent& event, MutableKeyState* state);
   void RewriteExtendedKeys(const ui::KeyEvent& event, MutableKeyState* state);
   void RewriteFunctionKeys(const ui::KeyEvent& event, MutableKeyState* state);
-  void RewriteLocatedEvent(const ui::Event& event, MutableKeyState* state);
+  void RewriteLocatedEvent(const ui::Event& event, int* flags);
 
   // A set of device IDs whose press event has been rewritten.
   std::set<int> pressed_device_ids_;
 
   std::map<int, DeviceType> device_id_to_type_;
   int last_device_id_;
 
   chromeos::input_method::ImeKeyboard* ime_keyboard_for_testing_;
   const PrefService* pref_service_for_testing_;
 
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_EVENTS_EVENT_REWRITER_H_