| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 379 new internal::MessageLoopProxyImpl(incoming_task_queue_); | 379 new internal::MessageLoopProxyImpl(incoming_task_queue_); |
| 380 thread_task_runner_handle_.reset( | 380 thread_task_runner_handle_.reset( |
| 381 new ThreadTaskRunnerHandle(message_loop_proxy_)); | 381 new ThreadTaskRunnerHandle(message_loop_proxy_)); |
| 382 } | 382 } |
| 383 | 383 |
| 384 void MessageLoop::RunHandler() { | 384 void MessageLoop::RunHandler() { |
| 385 DCHECK_EQ(this, current()); | 385 DCHECK_EQ(this, current()); |
| 386 | 386 |
| 387 StartHistogrammer(); | 387 StartHistogrammer(); |
| 388 | 388 |
| 389 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \ | 389 #if defined(USE_AURA) |
| 390 !defined(USE_GTK_MESSAGE_PUMP) | |
| 391 if (run_loop_->dispatcher_ && type() == TYPE_UI) { | 390 if (run_loop_->dispatcher_ && type() == TYPE_UI) { |
| 392 static_cast<MessagePumpForUI*>(pump_.get())-> | 391 static_cast<MessagePumpForUI*>(pump_.get())-> |
| 393 RunWithDispatcher(this, run_loop_->dispatcher_); | 392 RunWithDispatcher(this, run_loop_->dispatcher_); |
| 394 return; | 393 return; |
| 395 } | 394 } |
| 396 #endif | 395 #endif |
| 397 | 396 |
| 398 pump_->Run(this); | 397 pump_->Run(this); |
| 399 } | 398 } |
| 400 | 399 |
| (...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 719 fd, | 718 fd, |
| 720 persistent, | 719 persistent, |
| 721 mode, | 720 mode, |
| 722 controller, | 721 controller, |
| 723 delegate); | 722 delegate); |
| 724 } | 723 } |
| 725 | 724 |
| 726 #endif | 725 #endif |
| 727 | 726 |
| 728 } // namespace base | 727 } // namespace base |
| OLD | NEW |