diff options
author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 10:43:08 +0000 |
---|---|---|
committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 10:43:08 +0000 |
commit | 687b96058845cdaa59f9d81c468f81222e60bdfd (patch) | |
tree | 9c97670a35e5f6abe40f3c4bf50ee7b5a257a0e3 /chrome_frame/simple_resource_loader.cc | |
parent | d22618c155cd40c5740755a5f0bcaab59f13f9a7 (diff) | |
download | chromium_src-687b96058845cdaa59f9d81c468f81222e60bdfd.zip chromium_src-687b96058845cdaa59f9d81c468f81222e60bdfd.tar.gz chromium_src-687b96058845cdaa59f9d81c468f81222e60bdfd.tar.bz2 |
Add a new GetInstance() method for singleton classes, take 2.
This is a small step towards making all singleton classes use the Singleton<T> pattern within their code and not expect the callers to know about it.
This CL includes all files except those under chrome/browser, chrome/net, chrome/service and third_party/WebKit (these will be done in future CLs).
Suggested files to focus for reviewers:
- joi@ for files under src/ceee
- tommi@ for files under src/chrome_frame
- maruel@ for the rest of the files.
BUG=65298
TEST=all existing tests should continue to pass.
Review URL: http://codereview.chromium.org/5581008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/simple_resource_loader.cc')
-rw-r--r-- | chrome_frame/simple_resource_loader.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 89a51d7..324c5ca 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); |