diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 07:48:49 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 07:48:49 +0000 |
| commit | 625332e06437018bf696dce93a4b2bd2c5e0b118 (patch) | |
| tree | 56e128ddf94a81b6de1f29a9eabe59f0d79346c9 /chrome/installer | |
| parent | dc7cdcb970254f223262a66c812f240a8269ae87 (diff) | |
| download | chromium_src-625332e06437018bf696dce93a4b2bd2c5e0b118.zip chromium_src-625332e06437018bf696dce93a4b2bd2c5e0b118.tar.gz chromium_src-625332e06437018bf696dce93a4b2bd2c5e0b118.tar.bz2 | |
Make members of Singleton<T> private and only visible to the singleton type. This enforces that the Singleton<T> pattern can only be used within classes which want singleton-ness.
As part of this CL I have also fixed up files which got missed in my previous CLs to use a GetInstance() method and use Singleton<T> from the source file.
There are a small number of places where I have also switched to LazyInstance as that was more appropriate for types used in a single source file.
BUG=65298
TEST=all existing tests should continue to pass.
Review URL: http://codereview.chromium.org/5682008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
| -rw-r--r-- | chrome/installer/util/master_preferences.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/installer/util/master_preferences.cc b/chrome/installer/util/master_preferences.cc index 9fc3bd4..a5f763c 100644 --- a/chrome/installer/util/master_preferences.cc +++ b/chrome/installer/util/master_preferences.cc @@ -5,9 +5,9 @@ #include "chrome/installer/util/master_preferences.h" #include "base/file_util.h" +#include "base/lazy_instance.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/singleton.h" #include "base/string_util.h" #include "chrome/common/json_value_serializer.h" #include "chrome/installer/util/master_preferences_constants.h" @@ -19,6 +19,9 @@ namespace { const char kDistroDict[] = "distribution"; const char kFirstRunTabs[] = "first_run_tabs"; +base::LazyInstance<installer_util::MasterPreferences> g_master_preferences( + base::LINKER_INITIALIZED); + bool GetGURLFromValue(const Value* in_value, GURL* out_value) { if (!in_value || !out_value) return false; @@ -254,6 +257,6 @@ bool MasterPreferences::GetExtensionsBlock(DictionaryValue** extensions) const { // static const MasterPreferences& MasterPreferences::ForCurrentProcess() { - return *Singleton<MasterPreferences>::get(); + return g_master_preferences.Get(); } } // installer_util |