ui/base: Clean up our AcceleratorGtk class.

chrome/browser/ui/gtk/global_menu_bar.cc

Index: chrome/browser/ui/gtk/global_menu_bar.cc
diff --git a/chrome/browser/ui/gtk/global_menu_bar.cc b/chrome/browser/ui/gtk/global_menu_bar.cc
index 7916916f69cf9683db8c61ee335bcbc978995ff2..8eef8652f229b049f7b731fbdf29ea5fb0217b2f 100644
--- a/chrome/browser/ui/gtk/global_menu_bar.cc
+++ b/chrome/browser/ui/gtk/global_menu_bar.cc
@@ -174,15 +174,15 @@ GlobalMenuBar::GlobalMenuBar(Browser* browser)
         browser_->command_updater()->IsCommandEnabled(it->first));
 
     // Set the accelerator for each menu item.
-    const ui::AcceleratorGtk* accelerator_gtk =
-        AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(
-            it->first);
-    if (accelerator_gtk) {
+    AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
+    const ui::AcceleratorGtk* accelerator =
+        accelerators->GetPrimaryAcceleratorForCommand(it->first);
+    if (accelerator) {
       gtk_widget_add_accelerator(it->second,
                                  "activate",
                                  dummy_accel_group_,
-                                 accelerator_gtk->GetGdkKeyCode(),
-                                 accelerator_gtk->gdk_modifier_type(),
+                                 accelerator->GetGdkKeyCode(),
+                                 accelerator->gdk_modifier_type(),
                                  GTK_ACCEL_VISIBLE);
     }