Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5425)

Unified Diff: chrome/renderer/extensions/event_bindings.cc

Issue 5527004: Access singletons with a new GetInstance() method instead of Singleton<T>. (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. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/extensions/event_bindings.cc
diff --git a/chrome/renderer/extensions/event_bindings.cc b/chrome/renderer/extensions/event_bindings.cc
index 423c370b2a7c070de20f1c1debff122f18d705c5..60c5c0d349b3a7e32e1fa8416580fe8a7b444428 100644
--- a/chrome/renderer/extensions/event_bindings.cc
+++ b/chrome/renderer/extensions/event_bindings.cc
@@ -5,7 +5,7 @@
#include "chrome/renderer/extensions/event_bindings.h"
#include "base/basictypes.h"
-#include "base/singleton.h"
+#include "base/lazy_instance.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/extensions/bindings_utils.h"
@@ -61,8 +61,11 @@ struct SingletonData {
std::map<std::string, EventListenerCounts> listener_counts_;
};
+static base::LazyInstance<SingletonData> g_singleton_data(
+ base::LINKER_INITIALIZED);
+
static EventListenerCounts& GetListenerCounts(const std::string& extension_id) {
- return Singleton<SingletonData>()->listener_counts_[extension_id];
+ return g_singleton_data.Get().listener_counts_[extension_id];
}
class ExtensionImpl : public ExtensionBase {

Powered by Google App Engine
This is Rietveld 408576698