diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
| commit | 5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b (patch) | |
| tree | 4df72d2d3125b017df6fd3286d331a5fcd8498a4 /base/message_loop.h | |
| parent | 7f041050fd817116b78aa09227f511cc6505d7f3 (diff) | |
| download | chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.zip chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.gz chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.bz2 | |
Attempt four at landing the "histogram.h removed from message_loop.h" patch.
Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.
Rerunning trybots due to previous trybot breakage.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2965015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
| -rw-r--r-- | base/message_loop.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/message_loop.h b/base/message_loop.h index 8deacec..35b2651 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -9,11 +9,10 @@ #include <string> #include "base/basictypes.h" -#include "base/histogram.h" +#include "base/lock.h" #include "base/message_pump.h" #include "base/observer_list.h" #include "base/ref_counted.h" -#include "base/scoped_ptr.h" #include "base/task.h" #if defined(OS_WIN) @@ -27,6 +26,8 @@ #endif #endif +class Histogram; + // A MessageLoop is used to process events for a particular thread. There is // at most one MessageLoop instance per thread. // @@ -427,9 +428,6 @@ class MessageLoop : public base::MessagePump::Delegate { // If message_histogram_ is NULL, this is a no-op. void HistogramEvent(int event); - static const LinearHistogram::DescriptionPair event_descriptions_[]; - static bool enable_histogrammer_; - Type type_; // A list of tasks that need to be processed by this instance. Note that |