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

Unified Diff: content/browser/browsing_instance.h

Issue 8493016: content: Remove 16 exit time destructors and 15 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 1 month 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: content/browser/browsing_instance.h
diff --git a/content/browser/browsing_instance.h b/content/browser/browsing_instance.h
index 5d7de84860bab82b56751ee23624d6aeaa5a38ed..71c4695886f59fcd0d4cf775fd5f197e199f33e9 100644
--- a/content/browser/browsing_instance.h
+++ b/content/browser/browsing_instance.h
@@ -7,6 +7,7 @@
#pragma once
#include "base/hash_tables.h"
+#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
@@ -132,7 +133,10 @@ class CONTENT_EXPORT BrowsingInstance
SiteInstanceMap site_instance_map_;
// Global map of BrowserContext to SiteInstanceMap, for process-per-site.
- static ContextSiteInstanceMap context_site_instance_map_;
+ static base::LazyInstance<
Mark Mentovai 2011/11/07 22:34:15 private + static + in a .h file suggests that this
Nico 2011/11/07 23:29:21 I tried that everywhere, but it wasn't trivially p
Nico 2011/11/07 23:37:41 Ah, the problem was that the type depends on SiteI
+ ContextSiteInstanceMap,
+ base::LeakyLazyInstanceTraits<ContextSiteInstanceMap> >
+ context_site_instance_map_;
DISALLOW_COPY_AND_ASSIGN(BrowsingInstance);
};

Powered by Google App Engine
This is Rietveld 408576698