Apply Ash's key rewriter to an aura::MouseEvent so that Modifler+Click is handled correctly

chrome/browser/ui/views/ash/key_rewriter.h

 // Copyright (c) 2012 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_UI_VIEWS_ASH_KEY_REWRITER_H_
 #define CHROME_BROWSER_UI_VIEWS_ASH_KEY_REWRITER_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 36 matching lines @@
 
   KeyRewriter();
   virtual ~KeyRewriter();
 
   // Calls DeviceAddedInternal.
   DeviceType DeviceAddedForTesting(int device_id,
                                    const std::string& device_name);
   // Calls Rewrite.
   void RewriteForTesting(aura::KeyEvent* event);
 
+  // Calls RewriteLocatedEvent.
+  void RewriteLocatedEventForTesting(aura::LocatedEvent* event);
+
   const std::map<int, DeviceType>& device_id_to_type_for_testing() const {
     return device_id_to_type_;
   }
   void set_last_device_id_for_testing(int device_id) {
     last_device_id_ = device_id;
   }
   void set_pref_service_for_testing(const PrefService* pref_service) {
     pref_service_ = pref_service;
   }
 #if defined(OS_CHROMEOS)
   void set_xkeyboard_for_testing(chromeos::input_method::XKeyboard* xkeyboard) {
     xkeyboard_ = xkeyboard;
   }
 #endif
 
   // Gets DeviceType from the |device_name|.
   static DeviceType GetDeviceType(const std::string& device_name);
 
  private:
   // ash::KeyRewriterDelegate overrides:
   virtual ash::KeyRewriterDelegate::Action RewriteOrFilterKeyEvent(
       aura::KeyEvent* event) OVERRIDE;
+  virtual ash::KeyRewriterDelegate::Action RewriteOrFilterLocatedEvent(
+      aura::LocatedEvent* event) OVERRIDE;
 
   // aura::RootWindowObserver overrides:
   virtual void OnKeyboardMappingChanged(const aura::RootWindow* root) OVERRIDE;
 
 #if defined(OS_CHROMEOS)
   // chromeos::DeviceHierarchyObserver overrides:
   virtual void DeviceHierarchyChanged() OVERRIDE {}
   virtual void DeviceAdded(int device_id) OVERRIDE;
   virtual void DeviceRemoved(int device_id) OVERRIDE;
   virtual void DeviceKeyPressedOrReleased(int device_id) OVERRIDE;
@@ skipping 16 matching lines @@
   bool RewriteNumPadKeys(aura::KeyEvent* event);
 
   // Rewrites Backspace and Arrow keys following the Chrome OS keyboard spec.
   //  * Alt+Backspace -> Delete
   //  * Alt+Up -> Prior (aka PageUp)
   //  * Alt+Down -> Next (aka PageDown)
   //  * Ctrl+Alt+Up -> Home
   //  * Ctrl+Alt+Down -> End
   bool RewriteBackspaceAndArrowKeys(aura::KeyEvent* event);
 
+  // Rewrites the located |event|.
+  void RewriteLocatedEvent(aura::LocatedEvent* event);
+
   // Overwrites |event| with the keycodes and flags.
   void OverwriteEvent(aura::KeyEvent* event,
                       unsigned int new_native_keycode,
                       unsigned int new_native_state,
                       ui::KeyboardCode new_keycode,
                       int new_flags);
 
   // Checks the type of the |device_name|, and inserts a new entry to
   // |device_id_to_type_|.
   DeviceType DeviceAddedInternal(int device_id, const std::string& device_name);
 
   // Returns true if |last_device_id_| is Apple's.
   bool IsAppleKeyboard() const;
 
+  // Remaps |original_flags| to |remapped_flags|, |original_native_modifiers| to

[Daniel Erat, 2012/07/09 18:18:28]

nit: s/,/ and/

[Yusuke Sato, 2012/07/09 20:36:50]

Done.

+  // |remapped_native_modifiers| following the current user prefs.
+  void GetRemappedModifierMasks(int original_flags,
+                                unsigned int original_native_modifiers,
+                                int* remapped_flags,
+                                unsigned int* remapped_native_modifiers) const;
+
   std::map<int, DeviceType> device_id_to_type_;
   int last_device_id_;
 
 #if defined(OS_CHROMEOS)
   // X keycodes corresponding to various keysyms.
   unsigned int control_l_xkeycode_;
   unsigned int control_r_xkeycode_;
   unsigned int alt_l_xkeycode_;
   unsigned int alt_r_xkeycode_;
   unsigned int meta_l_xkeycode_;
@@ skipping 20 matching lines @@
 
   chromeos::input_method::XKeyboard* xkeyboard_;  // for testing.
 #endif
 
   const PrefService* pref_service_;  // for testing.
 
   DISALLOW_COPY_AND_ASSIGN(KeyRewriter);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_ASH_KEY_REWRITER_H_