| 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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 673 defined(OS_WIN) || defined(USE_X11)) | 673 defined(OS_WIN) || defined(USE_X11)) |
| 674 void MessageLoopForUI::AddObserver(Observer* observer) { | 674 void MessageLoopForUI::AddObserver(Observer* observer) { |
| 675 pump_ui()->AddObserver(observer); | 675 pump_ui()->AddObserver(observer); |
| 676 } | 676 } |
| 677 | 677 |
| 678 void MessageLoopForUI::RemoveObserver(Observer* observer) { | 678 void MessageLoopForUI::RemoveObserver(Observer* observer) { |
| 679 pump_ui()->RemoveObserver(observer); | 679 pump_ui()->RemoveObserver(observer); |
| 680 } | 680 } |
| 681 #endif // !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID) | 681 #endif // !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(OS_ANDROID) |
| 682 | 682 |
| 683 #if defined(USE_OZONE) | 683 #if defined(USE_OZONE) && !defined(OS_NACL) |
| 684 bool MessageLoopForUI::WatchFileDescriptor( | 684 bool MessageLoopForUI::WatchFileDescriptor( |
| 685 int fd, | 685 int fd, |
| 686 bool persistent, | 686 bool persistent, |
| 687 MessagePumpLibevent::Mode mode, | 687 MessagePumpLibevent::Mode mode, |
| 688 MessagePumpLibevent::FileDescriptorWatcher *controller, | 688 MessagePumpLibevent::FileDescriptorWatcher *controller, |
| 689 MessagePumpLibevent::Watcher *delegate) { | 689 MessagePumpLibevent::Watcher *delegate) { |
| 690 return pump_libevent()->WatchFileDescriptor( | 690 return pump_libevent()->WatchFileDescriptor( |
| 691 fd, | 691 fd, |
| 692 persistent, | 692 persistent, |
| 693 mode, | 693 mode, |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 739 fd, | 739 fd, |
| 740 persistent, | 740 persistent, |
| 741 mode, | 741 mode, |
| 742 controller, | 742 controller, |
| 743 delegate); | 743 delegate); |
| 744 } | 744 } |
| 745 | 745 |
| 746 #endif | 746 #endif |
| 747 | 747 |
| 748 } // namespace base | 748 } // namespace base |
| OLD | NEW |