Support Compat mode inside of the desktop tree.

chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc

Index: chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc
diff --git a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc
index 56fa8dcd269375dc9967af706f6233bde962f4da..7495d17ba0e999b4c6386d96686eb2f07c0174e2 100644
--- a/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc
+++ b/chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc
@@ -45,11 +45,13 @@ ui::EventRewriteStatus SpokenFeedbackEventRewriter::RewriteEvent(
     return ui::EVENT_REWRITE_CONTINUE;
 
   const ui::KeyEvent key_event = static_cast<const ui::KeyEvent&>(event);
+  int modifiers = key_event.flags() & (ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN |
+                                       ui::EF_ALT_DOWN | ui::EF_COMMAND_DOWN);
   std::string command_name;
   for (extensions::CommandMap::const_iterator iter = commands->begin();
        iter != commands->end(); ++iter) {
     if (iter->second.accelerator().key_code() == key_event.key_code() &&
-        iter->second.accelerator().modifiers() == key_event.flags())
+        iter->second.accelerator().modifiers() == modifiers)

[dmazzoni, 2015/06/17 19:29:58]

Should you be filtering the second accelerator modifiers the same way?

Should there maybe be a global constant for "all modifier keys" in
event_constants.h?

[David Tseng, 2015/06/17 21:15:13]

Done. Done for the key event to make the test pass, but doesn't seem to hurt to
do it for the commands accelerator in case a modifier ever gets added.
Done.

       command_name = iter->second.command_name();
   }