summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 20:27:37 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-01 20:27:37 +0000
commit8cdcca3a40bffd4510a0bc08c460faa1d877163e (patch)
treeb03ded0f9dd58854be1854cb2b2cdf0495c30500 /ui
parent2096a5d5ca18a10adb8d3f848e833a94c31991ac (diff)
downloadchromium_src-8cdcca3a40bffd4510a0bc08c460faa1d877163e.zip
chromium_src-8cdcca3a40bffd4510a0bc08c460faa1d877163e.tar.gz
chromium_src-8cdcca3a40bffd4510a0bc08c460faa1d877163e.tar.bz2
Make LazyInstance managed Locks leaky.
BUG=none TEST=none Review URL: http://codereview.chromium.org/8430019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108159 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/gl/gl_implementation_linux.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc
index 952e62e..1085fc4 100644
--- a/ui/gfx/gl/gl_implementation_linux.cc
+++ b/ui/gfx/gl/gl_implementation_linux.cc
@@ -49,7 +49,9 @@ base::NativeLibrary LoadLibrary(const char* filename) {
// TODO(backer): Find a more principled (less heavy handed) way to prevent a
// race in the bindings initialization.
#if (defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)) || defined(TOUCH_UI)
-base::LazyInstance<base::Lock> g_lock(base::LINKER_INITIALIZED);
+base::LazyInstance<base::Lock,
+ base::LeakyLazyInstanceTraits<base::Lock> >
+ g_lock(base::LINKER_INITIALIZED);
#endif
} // namespace anonymous