Chromium Code Reviews

Unified Diff: chrome/app/chrome_main.cc

Issue 5581008: Add a new GetInstance() method for singleton classes, take 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index 41b522edaab7cccf86367fa31323c6062792388e..24d6b0545b64ae7ef07a2b0419708c7dcd2d9cde 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -250,10 +250,7 @@ void LowLevelInit() {
SetupSignalHandlers();
- typedef Singleton<base::GlobalDescriptors,
- LeakySingletonTraits<base::GlobalDescriptors> >
- GlobalDescriptorsSingleton;
- base::GlobalDescriptors* g_fds = GlobalDescriptorsSingleton::get();
+ base::GlobalDescriptors* g_fds = base::GlobalDescriptors::GetLeakyInstance();
g_fds->Set(kPrimaryIPCChannel,
kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor);
#if defined(OS_LINUX)

Powered by Google App Engine