Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(47)

Unified Diff: chrome_frame/simple_resource_loader.cc

Issue 5581008: Add a new GetInstance() method for singleton classes, take 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome_frame/simple_resource_loader.cc
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
index 89a51d721361775631b060f3043bde4766788ff8..324c5cac7fdbd6a899adff27eecd79e90c5e40b6 100644
--- a/chrome_frame/simple_resource_loader.cc
+++ b/chrome_frame/simple_resource_loader.cc
@@ -88,8 +88,9 @@ SimpleResourceLoader::SimpleResourceLoader()
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);
@@ -115,6 +116,11 @@ SimpleResourceLoader::~SimpleResourceLoader() {
}
// static
+SimpleResourceLoader* SimpleResourceLoader::instance() {
+ return Singleton<SimpleResourceLoader>::get();
+}
+
+// static
void SimpleResourceLoader::GetPreferredLanguages(
std::vector<std::wstring>* language_tags) {
DCHECK(language_tags);

Powered by Google App Engine
This is Rietveld 408576698