OLD | NEW |
---|---|
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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.h" | 5 #include "base/message_loop.h" |
6 | 6 |
7 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 7 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
8 #include <gdk/gdk.h> | 8 #include <gdk/gdk.h> |
9 #include <gdk/gdkx.h> | 9 #include <gdk/gdkx.h> |
10 #endif | 10 #endif |
(...skipping 651 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
662 | 662 |
663 //------------------------------------------------------------------------------ | 663 //------------------------------------------------------------------------------ |
664 // MessageLoopForUI | 664 // MessageLoopForUI |
665 | 665 |
666 #if defined(OS_WIN) | 666 #if defined(OS_WIN) |
667 void MessageLoopForUI::DidProcessMessage(const MSG& message) { | 667 void MessageLoopForUI::DidProcessMessage(const MSG& message) { |
668 pump_win()->DidProcessMessage(message); | 668 pump_win()->DidProcessMessage(message); |
669 } | 669 } |
670 #endif // defined(OS_WIN) | 670 #endif // defined(OS_WIN) |
671 | 671 |
672 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 672 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
dmac
2011/02/23 04:57:22
should this be #if defined(USE_X11)
awong
2011/02/24 03:43:37
Done.
| |
673 Display* MessageLoopForUI::get_display() | 673 Display* MessageLoopForUI::GetDisplay() { |
674 { | |
675 return gdk_x11_get_default_xdisplay(); | 674 return gdk_x11_get_default_xdisplay(); |
676 } | 675 } |
677 #endif | 676 #endif |
678 | 677 |
679 #if !defined(OS_MACOSX) && !defined(OS_NACL) | 678 #if !defined(OS_MACOSX) && !defined(OS_NACL) |
680 void MessageLoopForUI::AddObserver(Observer* observer) { | 679 void MessageLoopForUI::AddObserver(Observer* observer) { |
681 pump_ui()->AddObserver(observer); | 680 pump_ui()->AddObserver(observer); |
682 } | 681 } |
683 | 682 |
684 void MessageLoopForUI::RemoveObserver(Observer* observer) { | 683 void MessageLoopForUI::RemoveObserver(Observer* observer) { |
(...skipping 29 matching lines...) Expand all Loading... | |
714 Watcher *delegate) { | 713 Watcher *delegate) { |
715 return pump_libevent()->WatchFileDescriptor( | 714 return pump_libevent()->WatchFileDescriptor( |
716 fd, | 715 fd, |
717 persistent, | 716 persistent, |
718 static_cast<base::MessagePumpLibevent::Mode>(mode), | 717 static_cast<base::MessagePumpLibevent::Mode>(mode), |
719 controller, | 718 controller, |
720 delegate); | 719 delegate); |
721 } | 720 } |
722 | 721 |
723 #endif | 722 #endif |
OLD | NEW |