diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 20:27:37 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-01 20:27:37 +0000 |
| commit | 8cdcca3a40bffd4510a0bc08c460faa1d877163e (patch) | |
| tree | b03ded0f9dd58854be1854cb2b2cdf0495c30500 /remoting | |
| parent | 2096a5d5ca18a10adb8d3f848e833a94c31991ac (diff) | |
| download | chromium_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 'remoting')
| -rw-r--r-- | remoting/host/local_input_monitor_mac.mm | 4 | ||||
| -rw-r--r-- | remoting/host/local_input_monitor_thread_win.cc | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/remoting/host/local_input_monitor_mac.mm b/remoting/host/local_input_monitor_mac.mm index c35a9b6..c6d9484 100644 --- a/remoting/host/local_input_monitor_mac.mm +++ b/remoting/host/local_input_monitor_mac.mm @@ -152,7 +152,9 @@ class LocalInputMonitorMac : public remoting::LocalInputMonitor { DISALLOW_COPY_AND_ASSIGN(LocalInputMonitorMac); }; -base::LazyInstance<base::Lock> monitor_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + monitor_lock(base::LINKER_INITIALIZED); LocalInputMonitorImpl* local_input_monitor = NULL; } // namespace diff --git a/remoting/host/local_input_monitor_thread_win.cc b/remoting/host/local_input_monitor_thread_win.cc index abd0ae6..8f9164c 100644 --- a/remoting/host/local_input_monitor_thread_win.cc +++ b/remoting/host/local_input_monitor_thread_win.cc @@ -13,7 +13,9 @@ using namespace remoting; namespace { LocalInputMonitorThread* g_local_input_monitor_thread = NULL; -base::LazyInstance<base::Lock> g_thread_lock(base::LINKER_INITIALIZED); +base::LazyInstance<base::Lock, + base::LeakyLazyInstanceTraits<base::Lock> > + g_thread_lock(base::LINKER_INITIALIZED); } // namespace |