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

Unified Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_win.cc ('k') | chrome/browser/ui/webui/constrained_html_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index edf75b82e8c8fb8f41e6623c525afd1226ea875f..a2261886f0257c6a881666c6d32bd3c7b868bdab 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -86,7 +86,7 @@ class ChromeURLContentSecurityPolicyExceptionSet
};
base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet>
- g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED);
+ g_chrome_url_content_security_policy_exceptions = LAZY_INSTANCE_INITIALIZER;
// Parse a URL into the components used to resolve its request. |source_name|
// is the hostname and |path| is the remaining portion of the URL.
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_view_win.cc ('k') | chrome/browser/ui/webui/constrained_html_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698