diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /chrome_frame/utils.h | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.h')
| -rw-r--r-- | chrome_frame/utils.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h index 97f9284..fc9928b 100644 --- a/chrome_frame/utils.h +++ b/chrome_frame/utils.h @@ -13,9 +13,9 @@ #include <vector> #include "base/basictypes.h" -#include "base/lock.h" #include "base/logging.h" #include "base/metrics/histogram.h" +#include "base/synchronization/lock.h" #include "base/threading/thread.h" #include "base/win/scoped_comptr.h" #include "gfx/rect.h" @@ -425,7 +425,7 @@ bool IsTopLevelWindow(HWND window); // Seeks a stream back to position 0. HRESULT RewindStream(IStream* stream); -extern Lock g_ChromeFrameHistogramLock; +extern base::Lock g_ChromeFrameHistogramLock; // Thread safe versions of the UMA histogram macros we use for ChromeFrame. // These should be used for histograms in ChromeFrame. If other histogram @@ -433,17 +433,17 @@ extern Lock g_ChromeFrameHistogramLock; // those should be defined and used. #define THREAD_SAFE_UMA_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, \ bucket_count) { \ - AutoLock lock(g_ChromeFrameHistogramLock); \ + base::AutoLock lock(g_ChromeFrameHistogramLock); \ UMA_HISTOGRAM_CUSTOM_COUNTS(name, sample, min, max, bucket_count); \ } #define THREAD_SAFE_UMA_HISTOGRAM_TIMES(name, sample) { \ - AutoLock lock(g_ChromeFrameHistogramLock); \ + base::AutoLock lock(g_ChromeFrameHistogramLock); \ UMA_HISTOGRAM_TIMES(name, sample); \ } #define THREAD_SAFE_UMA_HISTOGRAM_COUNTS(name, sample) { \ - AutoLock lock(g_ChromeFrameHistogramLock); \ + base::AutoLock lock(g_ChromeFrameHistogramLock); \ UMA_HISTOGRAM_COUNTS(name, sample); \ } |