Chromium Code Reviews| 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 #ifndef BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 5 #ifndef BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| 6 #define BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 6 #define BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| 7 | 7 |
| 8 #include <queue> | 8 #include <queue> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 521 TimeTicks high_resolution_timer_expiration_; | 521 TimeTicks high_resolution_timer_expiration_; |
| 522 // Should be set to true before calling Windows APIs like TrackPopupMenu, etc | 522 // Should be set to true before calling Windows APIs like TrackPopupMenu, etc |
| 523 // which enter a modal message loop. | 523 // which enter a modal message loop. |
| 524 bool os_modal_loop_; | 524 bool os_modal_loop_; |
| 525 #endif | 525 #endif |
| 526 | 526 |
| 527 // The next sequence number to use for delayed tasks. Updating this counter is | 527 // The next sequence number to use for delayed tasks. Updating this counter is |
| 528 // protected by incoming_queue_lock_. | 528 // protected by incoming_queue_lock_. |
| 529 int next_sequence_num_; | 529 int next_sequence_num_; |
| 530 | 530 |
| 531 bool always_notify_pump_; | |
| 532 | |
|
awong
2013/07/03 19:09:22
nit: spurious newline
Kristian Monsen
2013/07/03 21:20:03
Removed the variable, no changes in this file anym
| |
| 533 | |
| 531 ObserverList<TaskObserver> task_observers_; | 534 ObserverList<TaskObserver> task_observers_; |
| 532 | 535 |
| 533 // The message loop proxy associated with this message loop, if one exists. | 536 // The message loop proxy associated with this message loop, if one exists. |
| 534 scoped_refptr<MessageLoopProxy> message_loop_proxy_; | 537 scoped_refptr<MessageLoopProxy> message_loop_proxy_; |
| 535 scoped_ptr<ThreadTaskRunnerHandle> thread_task_runner_handle_; | 538 scoped_ptr<ThreadTaskRunnerHandle> thread_task_runner_handle_; |
| 536 | 539 |
| 537 template <class T, class R> friend class base::subtle::DeleteHelperInternal; | 540 template <class T, class R> friend class base::subtle::DeleteHelperInternal; |
| 538 template <class T, class R> friend class base::subtle::ReleaseHelperInternal; | 541 template <class T, class R> friend class base::subtle::ReleaseHelperInternal; |
| 539 | 542 |
| 540 void DeleteSoonInternal(const tracked_objects::Location& from_here, | 543 void DeleteSoonInternal(const tracked_objects::Location& from_here, |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 720 | 723 |
| 721 // Do not add any member variables to MessageLoopForIO! This is important b/c | 724 // Do not add any member variables to MessageLoopForIO! This is important b/c |
| 722 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra | 725 // MessageLoopForIO is often allocated via MessageLoop(TYPE_IO). Any extra |
| 723 // data that you need should be stored on the MessageLoop's pump_ instance. | 726 // data that you need should be stored on the MessageLoop's pump_ instance. |
| 724 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), | 727 COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForIO), |
| 725 MessageLoopForIO_should_not_have_extra_member_variables); | 728 MessageLoopForIO_should_not_have_extra_member_variables); |
| 726 | 729 |
| 727 } // namespace base | 730 } // namespace base |
| 728 | 731 |
| 729 #endif // BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ | 732 #endif // BASE_MESSAGE_LOOP_MESSAGE_LOOP_H_ |
| OLD | NEW |