diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:15:28 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:15:28 +0000 |
| commit | a91e1409a1b702892be19b058ad418b92ab4dd28 (patch) | |
| tree | f65055a03ec7147674e921e80664be5bef9acef0 /base/message_loop.h | |
| parent | 1ebe3cefbab03f450586895feea998f994ff13f8 (diff) | |
| download | chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.zip chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.gz chromium_src-a91e1409a1b702892be19b058ad418b92ab4dd28.tar.bz2 | |
Reland r52336.
(I accidentally committed a previous version of the patch (the fixed version
was in codereview since I had switched to my mac to address this exact compile
failure.)
BUG=none
TEST=none
TBR=evan
Review URL: http://codereview.chromium.org/2937010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52349 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 |