Support Compat mode inside of the desktop tree.

chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc

 // Copyright 2015 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.
 
 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 27 matching lines @@
           extension_misc::kChromeVoxExtensionId);
   if (!extension)
     return ui::EVENT_REWRITE_CONTINUE;
 
   const extensions::CommandMap* commands =
       extensions::CommandsInfo::GetNamedCommands(extension);
   if (!commands)
     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();
   }
 
   if (command_name.empty())
     return ui::EVENT_REWRITE_CONTINUE;
 
   scoped_ptr<base::ListValue> args(new base::ListValue());
   args->Append(new base::StringValue(command_name));
 
   scoped_ptr<extensions::Event> extension_event(
       new extensions::Event("commands.onCommand", args.Pass()));
   extension_event->restrict_to_browser_context = context;
 
   extensions::EventRouter::Get(context)->DispatchEventToExtension(
       extension_misc::kChromeVoxExtensionId, extension_event.Pass());
 
   return ui::EVENT_REWRITE_DISCARD;
 }
 
 ui::EventRewriteStatus SpokenFeedbackEventRewriter::NextDispatchEvent(
     const ui::Event& last_event,
     scoped_ptr<ui::Event>* new_event) {
   return ui::EVENT_REWRITE_CONTINUE;
 }