summaryrefslogtreecommitdiffstats
path: root/base/message_loop.h
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 20:23:43 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-07 20:23:43 +0000
commit9989c9bb16d23b11ff55daf8545b76c2eeba3440 (patch)
tree29637e8e9bb9c56fd04369405de6bfc4e73e151a /base/message_loop.h
parent3abebda09095620356405de505db7dd5bb22f3fd (diff)
downloadchromium_src-9989c9bb16d23b11ff55daf8545b76c2eeba3440.zip
chromium_src-9989c9bb16d23b11ff55daf8545b76c2eeba3440.tar.gz
chromium_src-9989c9bb16d23b11ff55daf8545b76c2eeba3440.tar.bz2
Make the order of methods in the cc files match the headers in base/.
BUG=68682 TEST=compiles Review URL: http://codereview.chromium.org/6189001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/message_loop.h')
-rw-r--r--base/message_loop.h18
1 files changed, 3 insertions, 15 deletions
diff --git a/base/message_loop.h b/base/message_loop.h
index 8058e24..d5093a9 100644
--- a/base/message_loop.h
+++ b/base/message_loop.h
@@ -103,6 +103,9 @@ class MessageLoop : public base::MessagePump::Delegate {
explicit MessageLoop(Type type = TYPE_DEFAULT);
~MessageLoop();
+ // Returns the MessageLoop object for the current thread, or null if none.
+ static MessageLoop* current();
+
static void EnableHistogrammer(bool enable_histogrammer);
// A DestructionObserver is notified when the current MessageLoop is being
@@ -229,9 +232,6 @@ class MessageLoop : public base::MessagePump::Delegate {
}
const std::string& thread_name() const { return thread_name_; }
- // Returns the MessageLoop object for the current thread, or null if none.
- static MessageLoop* current();
-
// Enables or disables the recursive task processing. This happens in the case
// of recursive message loops. Some unwanted message loop may occurs when
// using common controls or printer functions. By default, recursive task
@@ -391,18 +391,6 @@ class MessageLoop : public base::MessagePump::Delegate {
// Called to process any delayed non-nestable tasks.
bool ProcessNextDelayedNonNestableTask();
- //----------------------------------------------------------------------------
- // Run a work_queue_ task or new_task, and delete it (if it was processed by
- // PostTask). If there are queued tasks, the oldest one is executed and
- // new_task is queued. new_task is optional and can be NULL. In this NULL
- // case, the method will run one pending task (if any exist). Returns true if
- // it executes a task. Queued tasks accumulate only when there is a
- // non-nestable task currently processing, in which case the new_task is
- // appended to the list work_queue_. Such re-entrancy generally happens when
- // an unrequested message pump (typical of a native dialog) is executing in
- // the context of a task.
- bool QueueOrRunTask(Task* new_task);
-
// Runs the specified task and deletes it.
void RunTask(Task* task);