Maintain Diamond (F15) modifier state when rewriting.

chrome/browser/chromeos/events/event_rewriter.h

Index: chrome/browser/chromeos/events/event_rewriter.h
diff --git a/chrome/browser/chromeos/events/event_rewriter.h b/chrome/browser/chromeos/events/event_rewriter.h
index 2baf8f0fbd8f7ed3dd0d19fc9d2bf70b3f6b68b5..192cc90863be22d3f7a2f499c314c1d7c2ff8644 100644
--- a/chrome/browser/chromeos/events/event_rewriter.h
+++ b/chrome/browser/chromeos/events/event_rewriter.h
@@ -182,6 +182,11 @@ class EventRewriter : public ui::EventRewriter {
   // at time of writing it is a singleton in ash::Shell>
   ash::StickyKeysController* sticky_keys_controller_;
 
+  // The ChromeOS Diamond key arrives as F15. Since F15 is not a modifier,
+  // we need to track its pressed state explicitly, and apply the selected
+  // modifier flag to key and mouse presses that arrive while F15 is down.
+  int active_diamond_modifier_;

[Daniel Erat, 2014/07/15 23:53:25]

nit: document what this actually holds (i.e. an event flags bitmap), and a name
like |current_diamond_key_modifier_flags_| may be a bit clearer

[kpschoedel, 2014/07/16 15:12:28]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(EventRewriter);
 };