Filter modifier to only include accelerator modifiers.

chrome/browser/gtk/browser_window_gtk.cc

 // Copyright (c) 2009 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/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/base_paths_linux.h"
 #include "base/command_line.h"
@@ skipping 112 matching lines @@
   { GDK_g, IDC_FIND_NEXT, GDK_CONTROL_MASK },
   { GDK_F3, IDC_FIND_NEXT, GdkModifierType(0) },
   { GDK_g, IDC_FIND_PREVIOUS,
     GdkModifierType(GDK_CONTROL_MASK | GDK_SHIFT_MASK) },
   { GDK_F3, IDC_FIND_PREVIOUS, GDK_SHIFT_MASK },
 };
 
 int GetCommandId(guint accel_key, GdkModifierType modifier) {
   // Bug 9806: If capslock is on, we will get a capital letter as accel_key.
   accel_key = gdk_keyval_to_lower(accel_key);
+  // Filter modifier to only include accelerator modifiers.
+  modifier = static_cast<GdkModifierType>(
+      modifier & gtk_accelerator_get_default_mod_mask());
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     if (kAcceleratorMap[i].keyval == accel_key &&
         kAcceleratorMap[i].modifier_type == modifier)
       return kAcceleratorMap[i].command_id;
   }
   NOTREACHED();
   return 0;
 }
 
 // An event handler for key press events.  We need to special case key
@@ skipping 554 matching lines @@
   } else {
     browser_window->ExecuteBrowserCommand(command_id);
   }
 
   return TRUE;
 }
 
 void BrowserWindowGtk::ExecuteBrowserCommand(int id) {
   browser_->ExecuteCommand(id);
 }