diff options
| author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:23:37 +0000 |
|---|---|---|
| committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:23:37 +0000 |
| commit | 5820d2f0458c851b18df616ef3aff80cb4f8dba4 (patch) | |
| tree | dda803c05296f1bd8ee622c6d708a494373dcd1a /chrome_frame | |
| parent | 9acd869ec5621373757a6959310f39e1f5ec3f3d (diff) | |
| download | chromium_src-5820d2f0458c851b18df616ef3aff80cb4f8dba4.zip chromium_src-5820d2f0458c851b18df616ef3aff80cb4f8dba4.tar.gz chromium_src-5820d2f0458c851b18df616ef3aff80cb4f8dba4.tar.bz2 | |
Revert 68932 - 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
TBR=satish@chromium.org
Review URL: http://codereview.chromium.org/5721005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 | ||||
| -rw-r--r-- | chrome_frame/external_tab.cc | 7 |
2 files changed, 6 insertions, 9 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index ab13151..b670548 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,9 +569,7 @@ bool ProxyFactory::ReleaseAutomationServer(void* server_id, return true; } -static base::LazyInstance<ProxyFactory, - base::LeakyLazyInstanceTraits<ProxyFactory> > - g_proxy_factory(base::LINKER_INITIALIZED); +Singleton<ProxyFactory, LeakySingletonTraits<ProxyFactory> > g_proxy_factory; template <> struct RunnableMethodTraits<ChromeFrameAutomationClient> { static void RetainCallee(ChromeFrameAutomationClient* obj) {} @@ -588,7 +586,7 @@ ChromeFrameAutomationClient::ChromeFrameAutomationClient() ui_thread_id_(NULL), init_state_(UNINITIALIZED), use_chrome_network_(false), - proxy_factory_(g_proxy_factory.Pointer()), + proxy_factory_(g_proxy_factory.get()), handle_top_level_requests_(false), tab_handle_(-1), session_id_(-1), diff --git a/chrome_frame/external_tab.cc b/chrome_frame/external_tab.cc index 0d2609f..ca402d9 100644 --- a/chrome_frame/external_tab.cc +++ b/chrome_frame/external_tab.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome_frame/external_tab.h" -#include "base/lazy_instance.h" +#include "base/singleton.h" #include "base/tracked.h" #include "base/task.h" #include "base/waitable_event.h" @@ -14,8 +14,7 @@ DISABLE_RUNNABLE_METHOD_REFCOUNT(ExternalTabProxy); DISABLE_RUNNABLE_METHOD_REFCOUNT(UIDelegate); namespace { - static base::LazyInstance<ChromeProxyFactory> g_proxy_factory( - base::LINKER_INITIALIZED); + Singleton<ChromeProxyFactory> g_proxy_factory; struct UserDataHolder : public SyncMessageContext { explicit UserDataHolder(void* p) : data(p) {} @@ -25,7 +24,7 @@ namespace { ExternalTabProxy::ExternalTabProxy() : state_(NONE), tab_(0), tab_wnd_(NULL), - chrome_wnd_(NULL), proxy_factory_(g_proxy_factory.Pointer()), proxy_(NULL), + chrome_wnd_(NULL), proxy_factory_(g_proxy_factory.get()), proxy_(NULL), ui_delegate_(NULL) { } |