diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:58:17 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-14 18:58:17 +0000 |
| commit | 8efa6801b4ee41ab37d2b65fbd823fba242e1adb (patch) | |
| tree | bbe71d222b2e2c60a307e5f147af6011b0e6b021 /base/message_loop.h | |
| parent | f56e69453eced97f31dc23bc72ae883f9e260eee (diff) | |
| download | chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.zip chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.tar.gz chromium_src-8efa6801b4ee41ab37d2b65fbd823fba242e1adb.tar.bz2 | |
Revert everything related to the relanding.
Review URL: http://codereview.chromium.org/2982009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52367 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 |