diff options
Diffstat (limited to 'base/message_loop.cc')
| -rw-r--r-- | base/message_loop.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 348ace7..dace176 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -674,17 +674,13 @@ void MessageLoopForUI::DidProcessMessage(const MSG& message) { } #endif // defined(OS_WIN) -<<<<<<< HEAD -#if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(ANDROID) -======= #if defined(USE_X11) Display* MessageLoopForUI::GetDisplay() { return gdk_x11_get_default_xdisplay(); } #endif // defined(USE_X11) -#if !defined(OS_MACOSX) && !defined(OS_NACL) ->>>>>>> chromium.org at r11.0.696.0 +#if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(ANDROID) void MessageLoopForUI::AddObserver(Observer* observer) { pump_ui()->AddObserver(observer); } |