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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/common/np_channel_base.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix CrOS 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
« base/lazy_instance.cc ('K') | « content/common/net/url_fetcher_impl.cc ('k') | content/common/socket_stream_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/np_channel_base.cc
diff --git a/content/common/np_channel_base.cc b/content/common/np_channel_base.cc
index 62ea1e2599bccced5b85f0ce96471ab878f2bd3b..8425b37b65f927fac65265f952f3c0f4b0478a17 100644
--- a/content/common/np_channel_base.cc
+++ b/content/common/np_channel_base.cc
@@ -19,12 +19,12 @@
typedef base::hash_map<std::string, scoped_refptr<NPChannelBase> > ChannelMap;
static base::LazyInstance<ChannelMap,
base::LeakyLazyInstanceTraits<ChannelMap> >
- g_channels(base::LINKER_INITIALIZED);
+ g_channels = LINKER_ZERO_INITIALIZED;
typedef std::stack<scoped_refptr<NPChannelBase> > NPChannelRefStack;
static base::LazyInstance<NPChannelRefStack,
base::LeakyLazyInstanceTraits<NPChannelRefStack> >
- g_lazy_channel_stack(base::LINKER_INITIALIZED);
+ g_lazy_channel_stack = LINKER_ZERO_INITIALIZED;
static int next_pipe_id = 0;
« base/lazy_instance.cc ('K') | « content/common/net/url_fetcher_impl.cc ('k') | content/common/socket_stream_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698