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 #include "base/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 669 const void* object) { | 669 const void* object) { |
| 670 PostNonNestableTask(from_here, Bind(releaser, object)); | 670 PostNonNestableTask(from_here, Bind(releaser, object)); |
| 671 } | 671 } |
| 672 | 672 |
| 673 #if !defined(OS_NACL) | 673 #if !defined(OS_NACL) |
| 674 //------------------------------------------------------------------------------ | 674 //------------------------------------------------------------------------------ |
| 675 // MessageLoopForUI | 675 // MessageLoopForUI |
| 676 | 676 |
| 677 MessageLoopForUI::MessageLoopForUI(scoped_ptr<MessagePump> pump) | 677 MessageLoopForUI::MessageLoopForUI(scoped_ptr<MessagePump> pump) |
| 678 : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) { | 678 : MessageLoop(TYPE_UI, Bind(&ReturnPump, Passed(&pump))) { |
| 679 BindToCurrentThread(); | |
|
Peter Beverloo
2016/04/11 15:47:56
Stray change?
johnme
2016/04/21 10:58:37
No, but removed now I no longer use NestedMessageP
| |
| 679 } | 680 } |
| 680 | 681 |
| 681 #if defined(OS_ANDROID) | 682 #if defined(OS_ANDROID) |
| 682 void MessageLoopForUI::Start() { | 683 void MessageLoopForUI::Start() { |
| 683 // No Histogram support for UI message loop as it is managed by Java side | 684 // No Histogram support for UI message loop as it is managed by Java side |
| 684 static_cast<MessagePumpForUI*>(pump_.get())->Start(this); | 685 static_cast<MessagePumpForUI*>(pump_.get())->Start(this); |
| 685 } | 686 } |
| 686 #endif | 687 #endif |
| 687 | 688 |
| 688 #if defined(OS_IOS) | 689 #if defined(OS_IOS) |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 746 persistent, | 747 persistent, |
| 747 mode, | 748 mode, |
| 748 controller, | 749 controller, |
| 749 delegate); | 750 delegate); |
| 750 } | 751 } |
| 751 #endif | 752 #endif |
| 752 | 753 |
| 753 #endif // !defined(OS_NACL_SFI) | 754 #endif // !defined(OS_NACL_SFI) |
| 754 | 755 |
| 755 } // namespace base | 756 } // namespace base |
| OLD | NEW |