diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 23:15:32 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-14 23:15:32 +0000 |
| commit | 9bf0b36044584756132943f37a06f2fcaef7e5fb (patch) | |
| tree | 6e7f6e0c831372cb1fee518bc9166c0c4331ed96 /content | |
| parent | bb4628ae89c01f3ed942a24405a56f58cfbee68a (diff) | |
| download | chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.zip chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.tar.gz chromium_src-9bf0b36044584756132943f37a06f2fcaef7e5fb.tar.bz2 | |
Revert 206507 "Move message_pump to base/message_loop."
> Move message_pump to base/message_loop.
>
> This also fixes some namespace usage inside the message pump files and updates all users of these files to use the new location.
>
> BUG=
> R=sky@chromium.org
>
> Review URL: https://codereview.chromium.org/17078005
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/16897005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/power_save_blocker_x11.cc | 11 | ||||
| -rw-r--r-- | content/browser/udev_linux.h | 2 | ||||
| -rw-r--r-- | content/browser/web_contents/web_contents_view_mac.mm | 4 | ||||
| -rw-r--r-- | content/common/gpu/media/gles2_texture_to_egl_image_translator.cc | 5 | ||||
| -rw-r--r-- | content/shell/shell_application_mac.h | 2 | ||||
| -rw-r--r-- | content/test/browser_test_message_pump_android.h | 2 |
6 files changed, 12 insertions, 14 deletions
diff --git a/content/browser/power_save_blocker_x11.cc b/content/browser/power_save_blocker_x11.cc index d955643..36ded00 100644 --- a/content/browser/power_save_blocker_x11.cc +++ b/content/browser/power_save_blocker_x11.cc @@ -22,6 +22,11 @@ #include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "base/message_loop/message_loop_proxy.h" +#if defined(TOOLKIT_GTK) +#include "base/message_pump_gtk.h" +#else +#include "base/message_pump_aurax11.h" +#endif #include "base/nix/xdg_util.h" #include "base/synchronization/lock.h" #include "content/public/browser/browser_thread.h" @@ -30,12 +35,6 @@ #include "dbus/object_path.h" #include "dbus/object_proxy.h" -#if defined(TOOLKIT_GTK) -#include "base/message_loop/message_pump_gtk.h" -#else -#include "base/message_loop/message_pump_aurax11.h" -#endif - namespace { enum DBusAPI { diff --git a/content/browser/udev_linux.h b/content/browser/udev_linux.h index 2b89094..571d03b 100644 --- a/content/browser/udev_linux.h +++ b/content/browser/udev_linux.h @@ -41,7 +41,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/message_loop/message_pump_libevent.h" +#include "base/message_pump_libevent.h" extern "C" { struct udev; diff --git a/content/browser/web_contents/web_contents_view_mac.mm b/content/browser/web_contents/web_contents_view_mac.mm index 0d1353b..6b314c8 100644 --- a/content/browser/web_contents/web_contents_view_mac.mm +++ b/content/browser/web_contents/web_contents_view_mac.mm @@ -9,8 +9,8 @@ #include <string> #import "base/mac/scoped_sending_event.h" -#include "base/message_loop/message_loop.h" -#import "base/message_loop/message_pump_mac.h" +#include "base/message_loop.h" +#import "base/message_pump_mac.h" #include "content/browser/renderer_host/popup_menu_helper_mac.h" #include "content/browser/renderer_host/render_view_host_factory.h" #include "content/browser/renderer_host/render_view_host_impl.h" diff --git a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc index b0699ab..24a8554 100644 --- a/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc +++ b/content/common/gpu/media/gles2_texture_to_egl_image_translator.cc @@ -5,11 +5,10 @@ #include "content/common/gpu/media/gles2_texture_to_egl_image_translator.h" #include "base/logging.h" - #if defined(TOOLKIT_USES_GTK) -#include "base/message_loop/message_pump_gtk.h" +#include "base/message_pump_gtk.h" #elif defined(USE_AURA) -#include "base/message_loop/message_pump_aurax11.h" +#include "base/message_pump_aurax11.h" #endif namespace content { diff --git a/content/shell/shell_application_mac.h b/content/shell/shell_application_mac.h index 26718ac..88b8d9e 100644 --- a/content/shell/shell_application_mac.h +++ b/content/shell/shell_application_mac.h @@ -5,8 +5,8 @@ #ifndef CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ #define CONTENT_SHELL_SHELL_APPLICATION_MAC_H_ +#include "base/message_pump_mac.h" #include "base/mac/scoped_sending_event.h" -#include "base/message_loop/message_pump_mac.h" @interface ShellCrApplication : NSApplication<CrAppProtocol, CrAppControlProtocol> { diff --git a/content/test/browser_test_message_pump_android.h b/content/test/browser_test_message_pump_android.h index 1b670c1..d19b449 100644 --- a/content/test/browser_test_message_pump_android.h +++ b/content/test/browser_test_message_pump_android.h @@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/compiler_specific.h" -#include "base/message_loop/message_pump_android.h" +#include "base/message_pump_android.h" namespace content { |