Index: base/message_loop.h |
diff --git a/base/message_loop.h b/base/message_loop.h |
index 8058e24606ee929e324716a24dd19e9e0c323f68..d5093a95bb143384885cdfbb79b68c0868a55af0 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); |