ui/base: Clean up our AcceleratorGtk class.

chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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/gtk/extensions/extension_keybinding_registry_gtk.h"
 
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
+#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 
 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(
     Profile* profile, gfx::NativeWindow window)
     : ExtensionKeybindingRegistry(profile),
       profile_(profile),
       window_(window),
       accel_group_(NULL) {
   Init();
 }
 
@@ skipping 36 matching lines @@
       continue;
 
     if (!accel_group_) {
       accel_group_ = gtk_accel_group_new();
       gtk_window_add_accel_group(window_, accel_group_);
     }
 
     gtk_accel_group_connect(
         accel_group_,
         accelerator.GetGdkKeyCode(),
-        accelerator.gdk_modifier_type(),
+        accelerator.GetGdkModifierType(),
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAcceleratorThunk), this, NULL));
   }
 }
 
 void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybinding(
     const Extension* extension) {
   EventTargets::iterator iter = event_targets_.begin();
   while (iter != event_targets_.end()) {
     if (iter->second.first != extension->id()) {
       ++iter;
       continue;  // Not the extension we asked for.
     }
 
     // On GTK, unlike Windows, the Event Targets contain all events.
     if (ShouldIgnoreCommand(iter->second.second)) {
       ++iter;
       continue;
     }
 
     gtk_accel_group_disconnect_key(accel_group_,
                                    iter->first.GetGdkKeyCode(),
-                                   iter->first.gdk_modifier_type());
+                                   iter->first.GetGdkModifierType());
     EventTargets::iterator old = iter++;
     event_targets_.erase(old);
   }
 }
 
 gboolean ExtensionKeybindingRegistryGtk::OnGtkAccelerator(
     GtkAccelGroup* group,
     GObject* acceleratable,
     guint keyval,
     GdkModifierType modifier) {
   ui::AcceleratorGtk accelerator(keyval, modifier);
 
   ExtensionService* service = profile_->GetExtensionService();
 
   EventTargets::iterator it = event_targets_.find(accelerator);
   if (it == event_targets_.end()) {
     NOTREACHED();  // Shouldn't get this event for something not registered.
     return FALSE;
   }
 
   service->browser_event_router()->CommandExecuted(
       profile_, it->second.first, it->second.second);
 
   return TRUE;
 }