diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 17:47:13 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 17:47:13 +0000 |
| commit | f1d9428ecf3a598fb8bc86c9e1f8707dc6bd73cb (patch) | |
| tree | 674b70edcb7ba1059d8a7d22d5d57fac501a850b /base/message_loop.h | |
| parent | 03f57072cd19125c59fbc1d7c76f2856ca200850 (diff) | |
| download | chromium_src-f1d9428ecf3a598fb8bc86c9e1f8707dc6bd73cb.zip chromium_src-f1d9428ecf3a598fb8bc86c9e1f8707dc6bd73cb.tar.gz chromium_src-f1d9428ecf3a598fb8bc86c9e1f8707dc6bd73cb.tar.bz2 | |
Revert 52336 - More header cleanup:
- Some cleanup to url_request.h
- Remove task.h from headers that don't need it.
- Remove histogram.h from message_loop.h
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2986002
TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/2969006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
| -rw-r--r-- | base/message_loop.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/base/message_loop.h b/base/message_loop.h index 35b2651..8deacec 100644 --- a/base/message_loop.h +++ b/base/message_loop.h @@ -9,10 +9,11 @@ #include <string> #include "base/basictypes.h" -#include "base/lock.h" +#include "base/histogram.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) @@ -26,8 +27,6 @@ #endif #endif -class Histogram; - // A MessageLoop is used to process events for a particular thread. There is // at most one MessageLoop instance per thread. // @@ -428,6 +427,9 @@ 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 |