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 /base | |
| 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 'base')
| -rw-r--r-- | base/histogram.cc | 1 | ||||
| -rw-r--r-- | base/histogram.h | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/base/histogram.cc b/base/histogram.cc index a4912b9..4b76160 100644 --- a/base/histogram.cc +++ b/base/histogram.cc @@ -12,6 +12,7 @@ #include <math.h> #include <string> +#include "base/lock.h" #include "base/logging.h" #include "base/pickle.h" #include "base/string_util.h" diff --git a/base/histogram.h b/base/histogram.h index 64ae9cb..ac97a67 100644 --- a/base/histogram.h +++ b/base/histogram.h @@ -35,11 +35,12 @@ #include <string> #include <vector> -#include "base/lock.h" #include "base/ref_counted.h" #include "base/logging.h" #include "base/time.h" +class Lock; + //------------------------------------------------------------------------------ // Provide easy general purpose histogram in a macro, just like stats counters. // The first four macros use 50 buckets. @@ -361,7 +362,7 @@ class Histogram : public base::RefCountedThreadSafe<Histogram> { // Accessors for factory constuction, serialization and testing. //---------------------------------------------------------------------------- virtual ClassType histogram_type() const { return HISTOGRAM; } - const std::string histogram_name() const { return histogram_name_; } + const std::string& histogram_name() const { return histogram_name_; } Sample declared_min() const { return declared_min_; } Sample declared_max() const { return declared_max_; } virtual Sample ranges(size_t i) const { return ranges_[i];} |