Add a new GetInstance() method for singleton classes, take 2.

gfx/gtk_native_view_id_manager.h

 // Copyright (c) 2009 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.
 
 #ifndef GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
 #define GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 18 matching lines @@
 // availible and it goes very much against the grain of the code to make it so.
 // Also, we worry that GTK might choose to change the underlying X window id
 // when, say, the widget is hidden or repacked. Finally, if we used XIDs then a
 // compromised renderer could start asking questions about any X windows on the
 // system.
 //
 // Thus, we have this object. It produces random NativeViewIds from GtkWidget
 // pointers and observes the various signals from the widget for when an X
 // window is created, destroyed etc. Thus it provides a thread safe mapping
 // from NativeViewIds to the current XID for that widget.
-//
-// You get a reference to the global instance with:
-//   Singleton<GtkNativeViewManager>()
 class GtkNativeViewManager {
  public:
+  // Returns the singleton instance.
+  static GtkNativeViewManager* GetInstance();
+
   // Must be called from the UI thread:
   //
   // Return a NativeViewId for the given widget and attach to the various
   // signals emitted by that widget. The NativeViewId is pseudo-randomly
   // allocated so that a compromised renderer trying to guess values will fail
   // with high probability. The NativeViewId will not be reused for the
   // lifetime of the GtkWidget.
   gfx::NativeViewId GetIdForWidget(gfx::NativeView widget);
 
   // May be called from any thread:
@@ skipping 77 matching lines @@
   //
   // An XID will map to NULL, if there is an outstanding reference but the
   // widget was destroyed. In this case, the destruction of the X window
   // is deferred to the dropping of all references.
   std::map<XID, PermanentXIDInfo> perm_xid_to_info_;
 
   DISALLOW_COPY_AND_ASSIGN(GtkNativeViewManager);
 };
 
 #endif  // GFX_GTK_NATIVE_VIEW_ID_MANAGER_H_