Add a new GetInstance() method for remaining files with singleton classes under chrome/browser.

chrome/browser/gtk/browser_titlebar.cc

 // Copyright (c) 2010 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_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 289 matching lines @@
     gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_spy_frame_,
                      FALSE, FALSE, 0);
   }
   titlebar_right_buttons_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_box_pack_end(GTK_BOX(container_hbox_), titlebar_right_buttons_vbox_,
                    FALSE, FALSE, 0);
 
 #if defined(USE_GCONF)
   // Either read the gconf database and register for updates (on GNOME), or use
   // the default value (anywhere else).
-  Singleton<GConfTitlebarListener>()->SetTitlebarButtons(this);
+  GConfTitlebarListener::GetInstance()->SetTitlebarButtons(this);
 #else
   BuildButtons(kDefaultButtonString);
 #endif
 
   // We use an alignment to control the titlebar height.
   titlebar_alignment_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   if (browser_window_->browser()->type() == Browser::TYPE_NORMAL) {
     gtk_box_pack_start(GTK_BOX(container_hbox_), titlebar_alignment_, TRUE,
                        TRUE, 0);
 
@@ skipping 45 matching lines @@
   }
 
   gtk_widget_show_all(container_);
 
   ActiveWindowWatcherX::AddObserver(this);
 }
 
 BrowserTitlebar::~BrowserTitlebar() {
   ActiveWindowWatcherX::RemoveObserver(this);
 #if defined(USE_GCONF)
-  Singleton<GConfTitlebarListener>()->RemoveObserver(this);
+  GConfTitlebarListener::GetInstance()->RemoveObserver(this);
 #endif
 }
 
 void BrowserTitlebar::BuildButtons(const std::string& button_string) {
   // Clear out all previous data.
   close_button_.reset();
   restore_button_.reset();
   maximize_button_.reset();
   minimize_button_.reset();
   gtk_util::RemoveAllChildren(titlebar_left_buttons_vbox_);
@@ skipping 455 matching lines @@
                   !prefs->GetBoolean(prefs::kUseCustomChromeFrame));
     return;
   }
 
   browser_window_->browser()->ExecuteCommand(command_id);
 }
 
 bool BrowserTitlebar::GetAcceleratorForCommandId(
     int command_id, menus::Accelerator* accelerator) {
   const menus::AcceleratorGtk* accelerator_gtk =
-      Singleton<AcceleratorsGtk>()->GetPrimaryAcceleratorForCommand(
+      AcceleratorsGtk::GetInstance()->GetPrimaryAcceleratorForCommand(
           command_id);
   if (accelerator_gtk)
     *accelerator = *accelerator_gtk;
   return accelerator_gtk;
 }
 
 void BrowserTitlebar::Observe(NotificationType type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   switch (type.value) {
@@ skipping 76 matching lines @@
     menus::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }