diff options
author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
---|---|---|
committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 08:18:55 +0000 |
commit | 8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a (patch) | |
tree | a7425d106d83f1f031516e18ea9600363341fdb8 /chrome_frame/simple_resource_loader.cc | |
parent | 1bc1c69f95dab2c34232a5c8793cf9db51af2386 (diff) | |
download | chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.zip chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.gz chromium_src-8e8bb6d329bdad0efe5bddd5d39e0efe64d9846a.tar.bz2 |
Rename all methods accessing Singleton<T> as GetInstance().
This is in preparation to a subsequent CL where Singleton<T> will restrict access to only the type being made singleton.
I also moved pepper::ResourceTracker to a lazy instance since there were too many places in code where this class was being accessed from and this was a smaller change than renaming methods in that case.
BUG=65298
TEST=all existing tests should pass.
Review URL: http://codereview.chromium.org/5685007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/simple_resource_loader.cc')
-rw-r--r-- | chrome_frame/simple_resource_loader.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index 324c5ca..ce6407b 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -116,7 +116,7 @@ SimpleResourceLoader::~SimpleResourceLoader() { } // static -SimpleResourceLoader* SimpleResourceLoader::instance() { +SimpleResourceLoader* SimpleResourceLoader::GetInstance() { return Singleton<SimpleResourceLoader>::get(); } @@ -240,12 +240,12 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) { // static std::wstring SimpleResourceLoader::GetLanguage() { - return SimpleResourceLoader::instance()->language_; + return SimpleResourceLoader::GetInstance()->language_; } // static std::wstring SimpleResourceLoader::Get(int message_id) { - SimpleResourceLoader* loader = SimpleResourceLoader::instance(); + SimpleResourceLoader* loader = SimpleResourceLoader::GetInstance(); return loader->GetLocalizedResource(message_id); } |