From 4dcbc1b552d96791b13dc3d876868dae3f8ad09d Mon Sep 17 00:00:00 2001 From: "erg@chromium.org" Date: Fri, 16 Jul 2010 20:30:47 +0000 Subject: Remove lock.h from resource_bundle.h and histogram.h. Use a scoped_ptr 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 --- app/resource_bundle_dummy.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/resource_bundle_dummy.cc') diff --git a/app/resource_bundle_dummy.cc b/app/resource_bundle_dummy.cc index 6baa1a8..f5db317 100644 --- a/app/resource_bundle_dummy.cc +++ b/app/resource_bundle_dummy.cc @@ -6,6 +6,7 @@ #include +#include "base/lock.h" #include "base/logging.h" #include "base/win_util.h" #include "gfx/font.h" @@ -46,7 +47,8 @@ ResourceBundle& ResourceBundle::GetSharedInstance() { } ResourceBundle::ResourceBundle() - : resources_data_(NULL), + : lock_(new Lock), + resources_data_(NULL), locale_resources_data_(NULL) { } -- cgit v1.1