diff options
Diffstat (limited to 'chrome/browser/ui')
3 files changed, 6 insertions, 9 deletions
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager.cc b/chrome/browser/ui/webui/chrome_url_data_manager.cc index b57fb18..947f210 100644 --- a/chrome/browser/ui/webui/chrome_url_data_manager.cc +++ b/chrome/browser/ui/webui/chrome_url_data_manager.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,8 +28,7 @@ using content::BrowserThread; -static base::LazyInstance<base::Lock, - base::LeakyLazyInstanceTraits<base::Lock> > +static base::LazyInstance<base::Lock>::Leaky g_delete_lock = LAZY_INSTANCE_INITIALIZER; // static diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc index 003fad2..d88c947 100644 --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -121,8 +121,7 @@ static const char* kTimeZones[] = { "Pacific/Tongatapu", }; -static base::LazyInstance<base::Lock, - base::LeakyLazyInstanceTraits<base::Lock> > +static base::LazyInstance<base::Lock>::Leaky g_timezone_bundle_lock = LAZY_INSTANCE_INITIALIZER; struct UResClose { diff --git a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc index 51ffde6..3479ec8 100644 --- a/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc +++ b/chrome/browser/ui/webui/options2/chromeos/system_settings_provider2.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -121,8 +121,7 @@ static const char* kTimeZones[] = { "Pacific/Tongatapu", }; -static base::LazyInstance<base::Lock, - base::LeakyLazyInstanceTraits<base::Lock> > +static base::LazyInstance<base::Lock>::Leaky g_timezone_bundle_lock = LAZY_INSTANCE_INITIALIZER; struct UResClose { |