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

chrome/browser/chromeos/input_method/input_method_util.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/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
@@ skipping 91 matching lines @@
 };
 
 // Map from language code to associated input method IDs, etc.
 typedef std::multimap<std::string, std::string> LanguageCodeToIdsMap;
 struct IdMaps {
   scoped_ptr<LanguageCodeToIdsMap> language_code_to_ids;
   scoped_ptr<std::map<std::string, std::string> > id_to_language_code;
   scoped_ptr<std::map<std::string, std::string> > id_to_display_name;
   scoped_ptr<std::map<std::string, std::string> > id_to_keyboard_overlay_id;
 
+  // Returns the singleton instance.
+  static IdMaps* GetInstance() {
+    return Singleton<IdMaps>::get();
+  }
+
   void ReloadMaps() {
     chromeos::InputMethodLibrary* library =
         chromeos::CrosLibrary::Get()->GetInputMethodLibrary();
     scoped_ptr<chromeos::InputMethodDescriptors> supported_input_methods(
         library->GetSupportedInputMethods());
     if (supported_input_methods->size() <= 1) {
       LOG(ERROR) << "GetSupportedInputMethods returned a fallback ID";
       // TODO(yusukes): Handle this error in nicer way.
     }
 
@@ skipping 407 matching lines @@
   }
   return language_code;
 }
 
 std::string GetLanguageCodeFromInputMethodId(
     const std::string& input_method_id) {
   // The code should be compatible with one of codes used for UI languages,
   // defined in app/l10_util.cc.
   const char kDefaultLanguageCode[] = "en-US";
   std::map<std::string, std::string>::const_iterator iter
-      = Singleton<IdMaps>::get()->id_to_language_code->find(input_method_id);
-  return (iter == Singleton<IdMaps>::get()->id_to_language_code->end()) ?
+      = IdMaps::GetInstance()->id_to_language_code->find(input_method_id);
+  return (iter == IdMaps::GetInstance()->id_to_language_code->end()) ?
       // Returning |kDefaultLanguageCode| here is not for Chrome OS but for
       // Ubuntu where the ibus-xkb-layouts engine could be missing.
       kDefaultLanguageCode : iter->second;
 }
 
 std::string GetKeyboardLayoutName(const std::string& input_method_id) {
   if (!StartsWithASCII(input_method_id, "xkb:", true)) {
     return "";
   }
 
   std::vector<std::string> splitted_id;
   base::SplitString(input_method_id, ':', &splitted_id);
   return (splitted_id.size() > 1) ? splitted_id[1] : "";
 }
 
 std::string GetKeyboardOverlayId(const std::string& input_method_id) {
   const std::map<std::string, std::string>& id_map =
-      *(Singleton<IdMaps>::get()->id_to_keyboard_overlay_id);
+      *(IdMaps::GetInstance()->id_to_keyboard_overlay_id);
   std::map<std::string, std::string>::const_iterator iter =
       id_map.find(input_method_id);
   return (iter == id_map.end() ? "" : iter->second);
 }
 
 std::string GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) {
   static const char kDefaultDisplayName[] = "USA";
   std::map<std::string, std::string>::const_iterator iter
-      = Singleton<IdMaps>::get()->id_to_display_name->find(input_method_id);
-  return (iter == Singleton<IdMaps>::get()->id_to_display_name->end()) ?
+      = IdMaps::GetInstance()->id_to_display_name->find(input_method_id);
+  return (iter == IdMaps::GetInstance()->id_to_display_name->end()) ?
       kDefaultDisplayName : iter->second;
 }
 
 std::wstring GetLanguageDisplayNameFromCode(const std::string& language_code) {
   if (!g_browser_process) {
     return L"";
   }
   return UTF16ToWide(l10n_util::GetDisplayNameForLocale(
       language_code, g_browser_process->GetApplicationLocale(), true));
 }
@@ skipping 16 matching lines @@
       icu::Collator::createInstance(locale, error));
   if (U_FAILURE(error)) {
     collator.reset();
   }
   std::sort(language_codes->begin(), language_codes->end(),
             CompareLanguageCodesByLanguageName(collator.get()));
 }
 
 void SortInputMethodIdsByNames(std::vector<std::string>* input_method_ids) {
   SortInputMethodIdsByNamesInternal(
-      *(Singleton<IdMaps>::get()->id_to_language_code), input_method_ids);
+      *(IdMaps::GetInstance()->id_to_language_code), input_method_ids);
 }
 
 void SortInputMethodIdsByNamesInternal(
     const std::map<std::string, std::string>& id_to_language_code_map,
     std::vector<std::string>* input_method_ids) {
   if (!g_browser_process) {
     return;
   }
   UErrorCode error = U_ZERO_ERROR;
   icu::Locale locale(g_browser_process->GetApplicationLocale().c_str());
   scoped_ptr<icu::Collator> collator(
       icu::Collator::createInstance(locale, error));
   if (U_FAILURE(error)) {
     collator.reset();
   }
   std::stable_sort(input_method_ids->begin(), input_method_ids->end(),
                    CompareInputMethodIdsByLanguageName(
                        collator.get(), id_to_language_code_map));
 }
 
 bool GetInputMethodIdsFromLanguageCode(
     const std::string& normalized_language_code,
     InputMethodType type,
     std::vector<std::string>* out_input_method_ids) {
   return GetInputMethodIdsFromLanguageCodeInternal(
-      *Singleton<IdMaps>::get()->language_code_to_ids,
+      *IdMaps::GetInstance()->language_code_to_ids,
       normalized_language_code, type, out_input_method_ids);
 }
 
 bool GetInputMethodIdsFromLanguageCodeInternal(
     const std::multimap<std::string, std::string>& language_code_to_ids,
     const std::string& normalized_language_code,
     InputMethodType type,
     std::vector<std::string>* out_input_method_ids) {
   DCHECK(out_input_method_ids);
   out_input_method_ids->clear();
@@ skipping 37 matching lines @@
   value.string_list_value = input_method_ids;
   InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
   library->SetImeConfig(language_prefs::kGeneralSectionName,
                         language_prefs::kPreloadEnginesConfigName, value);
   if (!initial_input_method_id.empty()) {
     library->ChangeInputMethod(initial_input_method_id);
   }
 }
 
 void OnLocaleChanged() {
-  Singleton<IdMaps>::get()->ReloadMaps();
+  IdMaps::GetInstance()->ReloadMaps();
 }
 
 }  // namespace input_method
 }  // namespace chromeos