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

Unified Diff: webkit/plugins/npapi/webplugin_delegate_impl_win.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
Index: webkit/plugins/npapi/webplugin_delegate_impl_win.cc
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
index 61e39daa1e080858ff6428b54d6e41e952efe006..2c35bca7997850f7b873ef89e720b4e7913cfbe9 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc
@@ -70,30 +70,29 @@ const int kWindowedPluginPopupTimerMs = 50;
WebPluginDelegateImpl* g_current_plugin_instance = NULL;
typedef std::deque<MSG> ThrottleQueue;
-base::LazyInstance<ThrottleQueue> g_throttle_queue(base::LINKER_INITIALIZED);
-base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map(
- base::LINKER_INITIALIZED);
-
+base::LazyInstance<ThrottleQueue> g_throttle_queue(LINKER_ZERO_INITIALIZED;
+base::LazyInstance<std::map<HWND, WNDPROC> > g_window_handle_proc_map =
+ LINKER_ZERO_INITIALIZED;
// Helper object for patching the TrackPopupMenu API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu(
- base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_track_popup_menu =
+ LINKER_ZERO_INITIALIZED;
// Helper object for patching the SetCursor API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor(
- base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_set_cursor =
+ LINKER_ZERO_INITIALIZED;
// Helper object for patching the RegEnumKeyExW API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w(
- base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_reg_enum_key_ex_w =
+ LINKER_ZERO_INITIALIZED;
// Helper object for patching the GetProcAddress API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address(
- base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_proc_address =
+ LINKER_ZERO_INITIALIZED;
// Helper object for patching the GetKeyState API.
-base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_key_state(
- base::LINKER_INITIALIZED);
+base::LazyInstance<base::win::IATPatchFunction> g_iat_patch_get_key_state =
+ LINKER_ZERO_INITIALIZED;
// Saved key state globals and helper access functions.
SHORT (WINAPI *g_iat_orig_get_key_state)(int vkey);

Powered by Google App Engine
This is Rietveld 408576698