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

Side by Side Diff: chrome_frame/simple_resource_loader.cc

Issue 5685007: Rename all methods accessing Singleton<T> as GetInstance(). (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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/simple_resource_loader.h ('k') | chrome_frame/test/simple_resource_loader_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome_frame/simple_resource_loader.h" 5 #include "chrome_frame/simple_resource_loader.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 } else { 109 } else {
110 NOTREACHED() << "Failed loading any resource dll (even \"en-US\")."; 110 NOTREACHED() << "Failed loading any resource dll (even \"en-US\").";
111 } 111 }
112 } 112 }
113 113
114 SimpleResourceLoader::~SimpleResourceLoader() { 114 SimpleResourceLoader::~SimpleResourceLoader() {
115 locale_dll_handle_ = NULL; 115 locale_dll_handle_ = NULL;
116 } 116 }
117 117
118 // static 118 // static
119 SimpleResourceLoader* SimpleResourceLoader::instance() { 119 SimpleResourceLoader* SimpleResourceLoader::GetInstance() {
120 return Singleton<SimpleResourceLoader>::get(); 120 return Singleton<SimpleResourceLoader>::get();
121 } 121 }
122 122
123 // static 123 // static
124 void SimpleResourceLoader::GetPreferredLanguages( 124 void SimpleResourceLoader::GetPreferredLanguages(
125 std::vector<std::wstring>* language_tags) { 125 std::vector<std::wstring>* language_tags) {
126 DCHECK(language_tags); 126 DCHECK(language_tags);
127 // The full set of preferred languages and their fallbacks are given priority. 127 // The full set of preferred languages and their fallbacks are given priority.
128 std::vector<std::wstring> languages; 128 std::vector<std::wstring> languages;
129 if (base::win::i18n::GetThreadPreferredUILanguageList(&languages)) { 129 if (base::win::i18n::GetThreadPreferredUILanguageList(&languages)) {
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 if (!image) { 233 if (!image) {
234 NOTREACHED() << "unable to find resource: " << message_id; 234 NOTREACHED() << "unable to find resource: " << message_id;
235 return std::wstring(); 235 return std::wstring();
236 } 236 }
237 } 237 }
238 return std::wstring(image->achString, image->nLength); 238 return std::wstring(image->achString, image->nLength);
239 } 239 }
240 240
241 // static 241 // static
242 std::wstring SimpleResourceLoader::GetLanguage() { 242 std::wstring SimpleResourceLoader::GetLanguage() {
243 return SimpleResourceLoader::instance()->language_; 243 return SimpleResourceLoader::GetInstance()->language_;
244 } 244 }
245 245
246 // static 246 // static
247 std::wstring SimpleResourceLoader::Get(int message_id) { 247 std::wstring SimpleResourceLoader::Get(int message_id) {
248 SimpleResourceLoader* loader = SimpleResourceLoader::instance(); 248 SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance();
249 return loader->GetLocalizedResource(message_id); 249 return loader->GetLocalizedResource(message_id);
250 } 250 }
251 251
252 HMODULE SimpleResourceLoader::GetResourceModuleHandle() { 252 HMODULE SimpleResourceLoader::GetResourceModuleHandle() {
253 return locale_dll_handle_; 253 return locale_dll_handle_;
254 } 254 }
OLDNEW
« no previous file with comments | « chrome_frame/simple_resource_loader.h ('k') | chrome_frame/test/simple_resource_loader_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698