ui/base: Clean up our AcceleratorGtk class.

chrome/browser/ui/gtk/global_menu_bar.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/global_menu_bar.h"
 
 #include <gtk/gtk.h>
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 156 matching lines @@
   BuildGtkMenuFrom(IDS_HELP_MENU_LINUX, &id_to_menu_item_, help_menu, NULL);
 
   for (CommandIDMenuItemMap::const_iterator it = id_to_menu_item_.begin();
        it != id_to_menu_item_.end(); ++it) {
     // Get the starting enabled state.
     gtk_widget_set_sensitive(
         it->second,
         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);
     }
 
     browser_->command_updater()->AddCommandObserver(it->first, this);
   }
 
   pref_change_registrar_.Init(browser_->profile()->GetPrefs());
   pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   OnBookmarkBarVisibilityChanged();
 }
@@ skipping 108 matching lines @@
   }
 }
 
 void GlobalMenuBar::OnItemActivated(GtkWidget* sender) {
   if (block_activation_)
     return;
 
   int id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(sender), "command-id"));
   browser_->ExecuteCommandIfEnabled(id);
 }