Clean up event flags a bit:

chrome/browser/ui/libgtk2ui/gtk2_util.cc

 // 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.
 
 #include "chrome/browser/ui/libgtk2ui/gtk2_util.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
@@ skipping 75 matching lines @@
     modifier |= GDK_SHIFT_MASK;
   if (event_flag & ui::EF_CONTROL_DOWN)
     modifier |= GDK_CONTROL_MASK;
   if (event_flag & ui::EF_ALT_DOWN)
     modifier |= GDK_MOD1_MASK;
   return static_cast<GdkModifierType>(modifier);
 }
 
 int EventFlagsFromGdkState(guint state) {
   int flags = ui::EF_NONE;
-  flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_DOWN : ui::EF_NONE;
+  flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : ui::EF_NONE;
+  flags |= (state & GDK_LOCK_MASK) ? ui::EF_CAPS_LOCK_ON : ui::EF_NONE;
   flags |= (state & GDK_CONTROL_MASK) ? ui::EF_CONTROL_DOWN : ui::EF_NONE;
-  flags |= (state & GDK_SHIFT_MASK) ? ui::EF_SHIFT_DOWN : ui::EF_NONE;
   flags |= (state & GDK_MOD1_MASK) ? ui::EF_ALT_DOWN : ui::EF_NONE;
   flags |= (state & GDK_BUTTON1_MASK) ? ui::EF_LEFT_MOUSE_BUTTON : ui::EF_NONE;
   flags |=
       (state & GDK_BUTTON2_MASK) ? ui::EF_MIDDLE_MOUSE_BUTTON : ui::EF_NONE;
   flags |= (state & GDK_BUTTON3_MASK) ? ui::EF_RIGHT_MOUSE_BUTTON : ui::EF_NONE;
   return flags;
 }
 
 void TurnButtonBlue(GtkWidget* button) {
 #if GTK_MAJOR_VERSION == 2
@@ skipping 25 matching lines @@
 aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
   return reinterpret_cast<aura::Window*>(
       g_object_get_data(G_OBJECT(dialog), kAuraTransientParent));
 }
 
 void ClearAuraTransientParent(GtkWidget* dialog) {
   g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, NULL);
 }
 
 }  // namespace libgtk2ui