Continuation of CL 5685007, rename the singleton accessor method in more files.

chrome/browser/chromeos/wm_ipc.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/chromeos/wm_ipc.h"
 
 #include <gdk/gdkx.h>
 extern "C" {
 #include <X11/Xlib.h>
 }
 
 #include "app/x11_util.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
-#include "base/singleton.h"
 
 namespace chromeos {
 
 namespace {
 
 // A value from the Atom enum and the actual name that should be used to
 // look up its ID on the X server.
 struct AtomInfo {
   WmIpc::AtomType atom;
   const char* name;
@@ skipping 26 matching lines @@
                   32,  // size in bits of items in 'value'
                   PropModeReplace,
                   reinterpret_cast<const unsigned char*>(data.get()),
                   values.size());  // num items
   XFlush(x11_util::GetXDisplay());
   return true;
 }
 
 }  // namespace
 
+static base::LazyInstance<WmIpc> g_wm_ipc(base::LINKER_INITIALIZED);
+
 // static
 WmIpc* WmIpc::instance() {
-  static WmIpc* instance = NULL;
-  if (!instance)
-    instance = Singleton<WmIpc>::get();
-  return instance;
+  return g_wm_ipc.Pointer();

[M-A Ruel, 2010/12/13 15:54:02]

Eh, thanks for fixing it.

 }
 
 bool WmIpc::SetWindowType(GtkWidget* widget,
                           WmIpcWindowType type,
                           const std::vector<int>* params) {
   std::vector<int> values;
   values.push_back(type);
   if (params)
     values.insert(values.end(), params->begin(), params->end());
   return SetIntProperty(x11_util::GetX11WindowFromGtkWidget(widget),
@@ skipping 123 matching lines @@
   // Let the window manager know which version of the IPC messages we support.
   Message msg(chromeos::WM_IPC_MESSAGE_WM_NOTIFY_IPC_VERSION);
   // TODO: The version number is the latest listed in wm_ipc.h --
   // ideally, once this header is shared between Chrome and the Chrome OS window
   // manager, we'll just define the version statically in the header.
   msg.set_param(0, 1);
   SendMessage(msg);
 }
 
 }  // namespace chromeos