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

chrome/browser/gtk/browser_window_gtk.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_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <string>
 
@@ skipping 645 matching lines @@
 
   // We're going to destroy the window, make sure the tab strip isn't running
   // any animations which may still reference GtkWidgets.
   tabstrip_->StopAnimation();
 
   SaveWindowPosition();
 
   if (accel_group_) {
     // Disconnecting the keys we connected to our accelerator group frees the
     // closures allocated in ConnectAccelerators.
-    AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get();
+    AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
     for (AcceleratorsGtk::const_iterator iter = accelerators->begin();
          iter != accelerators->end(); ++iter) {
       gtk_accel_group_disconnect_key(accel_group_,
           iter->second.GetGdkKeyCode(),
           static_cast<GdkModifierType>(iter->second.modifiers()));
     }
     gtk_window_remove_accel_group(window_, accel_group_);
     g_object_unref(accel_group_);
     accel_group_ = NULL;
   }
@@ skipping 1037 matching lines @@
       gdk_window_shape_combine_region(GTK_WIDGET(window_)->window, NULL, 0, 0);
     }
     gtk_alignment_set_padding(GTK_ALIGNMENT(window_container_), 0, 0, 0, 0);
   }
 }
 
 void BrowserWindowGtk::ConnectAccelerators() {
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group_);
 
-  AcceleratorsGtk* accelerators = Singleton<AcceleratorsGtk>().get();
+  AcceleratorsGtk* accelerators = AcceleratorsGtk::GetInstance();
   for (AcceleratorsGtk::const_iterator iter = accelerators->begin();
        iter != accelerators->end(); ++iter) {
     gtk_accel_group_connect(
         accel_group_,
         iter->second.GetGdkKeyCode(),
         static_cast<GdkModifierType>(iter->second.modifiers()),
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator),
                        GINT_TO_POINTER(iter->first), NULL));
   }
@@ skipping 499 matching lines @@
   // special-case the ones where the custom frame should be used.  These names
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }