chrome/app/chrome_main_delegate.cc - Issue 8491043: Allow linker initialization of lazy instance

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: willchan comments + rebase 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:

Index: chrome/app/chrome_main_delegate.cc

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc

index b2c55a659071f742660fad10b25bd38aa72351c1..618b8942dd45635e78c82326dbf0459e0d542bd4 100644

--- a/chrome/app/chrome_main_delegate.cc

+++ b/chrome/app/chrome_main_delegate.cc

@@ -97,13 +97,13 @@

#endif

base::LazyInstance<chrome::ChromeContentBrowserClient>

- g_chrome_content_browser_client(base::LINKER_INITIALIZED);

+ g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER;

base::LazyInstance<chrome::ChromeContentRendererClient>

- g_chrome_content_renderer_client(base::LINKER_INITIALIZED);

+ g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER;

base::LazyInstance<chrome::ChromeContentUtilityClient>

- g_chrome_content_utility_client(base::LINKER_INITIALIZED);

+ g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER;

base::LazyInstance<chrome::ChromeContentPluginClient>

- g_chrome_content_plugin_client(base::LINKER_INITIALIZED);

+ g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER;

extern int NaClMain(const content::MainFunctionParams&);

extern int ServiceProcessMain(const content::MainFunctionParams&);