From 3d63b94427bad65061f89b7e621e8f9736462f1c Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 11 May 2011 21:42:13 +0100 Subject: Merge Chromium at 10.0.621.0: Fix conflict in message_loop.cc Upstream change at the same place as our local change. http://codereview.chromium.org/5435001 Change-Id: I46034835f1fc3b2933f3097c9b1bccaf5f7d6eb1 --- base/message_loop.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'base') diff --git a/base/message_loop.cc b/base/message_loop.cc index 98c7ceb..d3766b1 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -668,11 +668,7 @@ void MessageLoopForUI::DidProcessMessage(const MSG& message) { } #endif // defined(OS_WIN) -<<<<<<< HEAD -#if !defined(OS_MACOSX) && !defined(ANDROID) -======= -#if !defined(OS_MACOSX) && !defined(OS_NACL) ->>>>>>> chromium.org at r10.0.621.0 +#if !defined(OS_MACOSX) && !defined(OS_NACL) && !defined(ANDROID) void MessageLoopForUI::AddObserver(Observer* observer) { pump_ui()->AddObserver(observer); } -- cgit v1.1