diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 09:13:54 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 09:13:54 +0000 |
| commit | 49ab556cfe14de363a74ce771931832304a1a038 (patch) | |
| tree | 7703457c54a035f2eebe38babecaba12b6bfb975 /chrome_frame/chrome_frame_automation.cc | |
| parent | 0310169705d607a78bc288e74038fe104b4474fd (diff) | |
| download | chromium_src-49ab556cfe14de363a74ce771931832304a1a038.zip chromium_src-49ab556cfe14de363a74ce771931832304a1a038.tar.gz chromium_src-49ab556cfe14de363a74ce771931832304a1a038.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@68932 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index b670548..ab13151 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -11,11 +11,11 @@ #include "base/debug/trace_event.h" #include "base/file_util.h" #include "base/file_version_info.h" +#include "base/lazy_instance.h" #include "base/lock.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/singleton.h" #include "base/string_util.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" @@ -569,7 +569,9 @@ bool ProxyFactory::ReleaseAutomationServer(void* server_id, return true; } -Singleton<ProxyFactory, LeakySingletonTraits<ProxyFactory> > g_proxy_factory; +static base::LazyInstance<ProxyFactory, + base::LeakyLazyInstanceTraits<ProxyFactory> > + g_proxy_factory(base::LINKER_INITIALIZED); template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> { static void RetainCallee(ChromeFrameAutomationClient* obj) {} @@ -586,7 +588,7 @@ ChromeFrameAutomationClient::ChromeFrameAutomationClient() ui_thread_id_(NULL), init_state_(UNINITIALIZED), use_chrome_network_(false), - proxy_factory_(g_proxy_factory.get()), + proxy_factory_(g_proxy_factory.Pointer()), handle_top_level_requests_(false), tab_handle_(-1), session_id_(-1), |