| Index: chrome_frame/simple_resource_loader.cc
|
| diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
|
| index 324c5cac7fdbd6a899adff27eecd79e90c5e40b6..ce6407bb87d2c0e053a70a5a49b7902c8da8fc06 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);
|
| }
|
|
|
|
|