diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 20:30:47 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-16 20:30:47 +0000 |
| commit | 4dcbc1b552d96791b13dc3d876868dae3f8ad09d (patch) | |
| tree | 82283d5f574dd529990f4a4cf4d5a99e8b2c28b6 /app/resource_bundle.h | |
| parent | 7e74015beb3489b46150bdfe055f67c9e2a0c475 (diff) | |
| download | chromium_src-4dcbc1b552d96791b13dc3d876868dae3f8ad09d.zip chromium_src-4dcbc1b552d96791b13dc3d876868dae3f8ad09d.tar.gz chromium_src-4dcbc1b552d96791b13dc3d876868dae3f8ad09d.tar.bz2 | |
Remove lock.h from resource_bundle.h and histogram.h.
Use a scoped_ptr<Lock> instead of Lock in resource bundle.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3038005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52730 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle.h')
| -rw-r--r-- | app/resource_bundle.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/resource_bundle.h b/app/resource_bundle.h index e2ec86c..a8c1cf7 100644 --- a/app/resource_bundle.h +++ b/app/resource_bundle.h @@ -17,7 +17,6 @@ #include "base/basictypes.h" #include "base/file_path.h" -#include "base/lock.h" #include "base/ref_counted_memory.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -31,6 +30,7 @@ typedef struct _GdkPixbuf GdkPixbuf; namespace gfx { class Font; } +class Lock; class SkBitmap; typedef uint32 SkColor; namespace base { @@ -232,7 +232,7 @@ class ResourceBundle { // Class level lock. Used to protect internal data structures that may be // accessed from other threads (e.g., skia_images_). - Lock lock_; + scoped_ptr<Lock> lock_; // Handles for data sources. DataHandle resources_data_; |