diff options
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r-- | chrome/browser/extensions/crx_installer.cc | 2 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_omnibox_api.cc | 3 | ||||
-rw-r--r-- | chrome/browser/extensions/extension_webnavigation_api.cc | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index c650daa..934bfd7 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -53,7 +53,7 @@ struct Whitelist { }; static base::LazyInstance<Whitelist> - g_whitelisted_install_data(base::LINKER_INITIALIZED); + g_whitelisted_install_data = LAZY_INSTANCE_INITIALIZER; } // namespace diff --git a/chrome/browser/extensions/extension_omnibox_api.cc b/chrome/browser/extensions/extension_omnibox_api.cc index 1590927b..300333e 100644 --- a/chrome/browser/extensions/extension_omnibox_api.cc +++ b/chrome/browser/extensions/extension_omnibox_api.cc @@ -41,7 +41,8 @@ const char kDescriptionStylesOffset[] = "offset"; const char kDescriptionStylesLength[] = "length"; static base::LazyInstance<PropertyAccessor<ExtensionOmniboxSuggestion> > - g_extension_omnibox_suggestion_property_accessor(base::LINKER_INITIALIZED); + g_extension_omnibox_suggestion_property_accessor = + LAZY_INSTANCE_INITIALIZER; PropertyAccessor<ExtensionOmniboxSuggestion>& GetPropertyAccessor() { return g_extension_omnibox_suggestion_property_accessor.Get(); diff --git a/chrome/browser/extensions/extension_webnavigation_api.cc b/chrome/browser/extensions/extension_webnavigation_api.cc index 0cc2d01..d80b898 100644 --- a/chrome/browser/extensions/extension_webnavigation_api.cc +++ b/chrome/browser/extensions/extension_webnavigation_api.cc @@ -29,8 +29,8 @@ namespace { typedef std::map<TabContents*, ExtensionWebNavigationTabObserver*> TabObserverMap; -static base::LazyInstance<TabObserverMap> g_tab_observer( - base::LINKER_INITIALIZED); +static base::LazyInstance<TabObserverMap> g_tab_observer = + LAZY_INSTANCE_INITIALIZER; // URL schemes for which we'll send events. const char* kValidSchemes[] = { |