Chromium Code Reviews| Index: chrome/browser/chromeos/login/signed_settings_helper.cc |
| diff --git a/chrome/browser/chromeos/login/signed_settings_helper.cc b/chrome/browser/chromeos/login/signed_settings_helper.cc |
| index ad86e8384b976a8d556fd7b2e76db09d0a826daa..6a1a7351038df2eeebf2697d1f387b8a0b374041 100644 |
| --- a/chrome/browser/chromeos/login/signed_settings_helper.cc |
| +++ b/chrome/browser/chromeos/login/signed_settings_helper.cc |
| @@ -7,9 +7,9 @@ |
| #include <string> |
| #include <vector> |
| +#include "base/lazy_instance.h" |
| #include "base/logging.h" |
| #include "base/ref_counted.h" |
| -#include "base/singleton.h" |
| #include "chrome/browser/browser_thread.h" |
| #include "chrome/browser/chromeos/login/signed_settings.h" |
| @@ -262,10 +262,13 @@ class SignedSettingsHelperImpl : public SignedSettingsHelper, |
| std::vector<OpContext*> pending_contexts_; |
| - friend struct DefaultSingletonTraits<SignedSettingsHelperImpl>; |
| + friend struct base::DefaultLazyInstanceTraits<SignedSettingsHelperImpl>; |
| DISALLOW_COPY_AND_ASSIGN(SignedSettingsHelperImpl); |
| }; |
| +static base::LazyInstance<SignedSettingsHelperImpl> |
|
Evan Martin
2010/12/13 17:38:30
*
|
| + g_signed_settings_helper_impl(base::LINKER_INITIALIZED); |
| + |
| SignedSettingsHelperImpl::SignedSettingsHelperImpl() { |
| } |
| @@ -371,7 +374,7 @@ void SignedSettingsHelperImpl::OnOpCompleted(OpContext* context) { |
| } |
| SignedSettingsHelper* SignedSettingsHelper::Get() { |
| - return Singleton<SignedSettingsHelperImpl>::get(); |
| + return g_signed_settings_helper_impl.Pointer(); |
| } |
| } // namespace chromeos |