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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page.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') | « chrome/browser/safe_browsing/malware_details.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 7e13c1d100644cd0587f080affb1713918829641..ea109618e8ad15d0fa51de1bd5b08dbe545f4cea 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -102,7 +102,7 @@ static const char* const kBoxChecked = "boxchecked";
SafeBrowsingBlockingPageFactory* SafeBrowsingBlockingPage::factory_ = NULL;
static base::LazyInstance<SafeBrowsingBlockingPage::UnsafeResourceMap>
- g_unsafe_resource_map(base::LINKER_INITIALIZED);
+ g_unsafe_resource_map = LINKER_ZERO_INITIALIZED;
// The default SafeBrowsingBlockingPageFactory. Global, made a singleton so we
// don't leak it.
@@ -127,7 +127,7 @@ class SafeBrowsingBlockingPageFactoryImpl
};
static base::LazyInstance<SafeBrowsingBlockingPageFactoryImpl>
- g_safe_browsing_blocking_page_factory_impl(base::LINKER_INITIALIZED);
+ g_safe_browsing_blocking_page_factory_impl = LINKER_ZERO_INITIALIZED;
SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
SafeBrowsingService* sb_service,
« base/lazy_instance.cc ('K') | « chrome/browser/safe_browsing/malware_details.cc ('k') | chrome/browser/safe_browsing/safe_browsing_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698