diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-16 02:53:21 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:06 +0100 |
| commit | e4feccc6428acb735e68c15bcf972504a705c547 (patch) | |
| tree | 044b1c4f7d288527446197a5fcfbd87aa2149a88 /base | |
| parent | 66a93bca8386dbe566b8ebbe4039d596bc52207f (diff) | |
| download | external_chromium-e4feccc6428acb735e68c15bcf972504a705c547.zip external_chromium-e4feccc6428acb735e68c15bcf972504a705c547.tar.gz external_chromium-e4feccc6428acb735e68c15bcf972504a705c547.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflict in message_loop.cc
Added a function close to a local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/base/message_loop.cc?view=diff&pathrev=77261&r1=76073&r2=76074
http://src.chromium.org/viewvc/chrome/trunk/src/base/message_loop.cc?view=diff&pathrev=77261&r1=75476&r2=75477
Change-Id: I5a4ff62bb14b762e495cdf44ff0eefef9470cc5d
Diffstat (limited to 'base')
| -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); } |