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

chrome_frame/simple_resource_loader.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_frame/simple_resource_loader.h"
 
 #include <atlbase.h>
 
 #include <algorithm>
 
@@ skipping 70 matching lines @@
 }
 
 }  // namespace
 
 SimpleResourceLoader::SimpleResourceLoader()
     : locale_dll_handle_(NULL) {
   // Find and load the resource DLL.
   std::vector<std::wstring> language_tags;
 
   // First, try the locale dictated by policy and its fallback.
-  PushBackWithFallbackIfAbsent(Singleton<PolicySettings>()->ApplicationLocale(),
-                               &language_tags);
+  PushBackWithFallbackIfAbsent(
+      PolicySettings::GetInstance()->ApplicationLocale(),
+      &language_tags);
 
   // Next, try the thread, process, user, system languages.
   GetPreferredLanguages(&language_tags);
 
   // Finally, fall-back on "en-US" (which may already be present in the vector,
   // but that's okay since we'll exit with success when the first is tried).
   language_tags.push_back(L"en-US");
 
   FilePath locales_path;
   FilePath locale_dll_path;
 
   DetermineLocalesDirectory(&locales_path);
   if (LoadLocaleDll(language_tags, locales_path, &locale_dll_handle_,
                     &locale_dll_path)) {
     language_ = locale_dll_path.BaseName().RemoveExtension().value();
   } else {
     NOTREACHED() << "Failed loading any resource dll (even \"en-US\").";
   }
 }
 
 SimpleResourceLoader::~SimpleResourceLoader() {
   locale_dll_handle_ = NULL;
 }
 
 // static
+SimpleResourceLoader* SimpleResourceLoader::instance() {
+  return Singleton<SimpleResourceLoader>::get();
+}
+
+// static
 void SimpleResourceLoader::GetPreferredLanguages(
     std::vector<std::wstring>* language_tags) {
   DCHECK(language_tags);
   // The full set of preferred languages and their fallbacks are given priority.
   std::vector<std::wstring> languages;
   if (base::win::i18n::GetThreadPreferredUILanguageList(&languages)) {
     for (std::vector<std::wstring>::const_iterator scan = languages.begin(),
              end = languages.end(); scan != end; ++scan) {
       PushBackIfAbsent(*scan, language_tags);
     }
@@ skipping 111 matching lines @@
 
 // static
 std::wstring SimpleResourceLoader::Get(int message_id) {
   SimpleResourceLoader* loader = SimpleResourceLoader::instance();
   return loader->GetLocalizedResource(message_id);
 }
 
 HMODULE SimpleResourceLoader::GetResourceModuleHandle() {
   return locale_dll_handle_;
 }