diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 20:27:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 20:27:52 +0000 |
| commit | 59e69e745ba3fa290ff3c50e65c3db03ee9dde6b (patch) | |
| tree | 64b82fd1e2375845b59f278f2a1e892dcf54377b /content/browser/power_save_blocker_x11.cc | |
| parent | bd41e70e44d19eb809eb8565b1d8479daef5d8f5 (diff) | |
| download | chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.zip chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.gz chromium_src-59e69e745ba3fa290ff3c50e65c3db03ee9dde6b.tar.bz2 | |
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.
Reland of 206507.
Original review https://codereview.chromium.org/17078005/
TBR=sky
Review URL: https://codereview.chromium.org/16897006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/power_save_blocker_x11.cc')
| -rw-r--r-- | content/browser/power_save_blocker_x11.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/browser/power_save_blocker_x11.cc b/content/browser/power_save_blocker_x11.cc index 36ded00..d955643 100644 --- a/content/browser/power_save_blocker_x11.cc +++ b/content/browser/power_save_blocker_x11.cc @@ -22,11 +22,6 @@ #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" @@ -35,6 +30,12 @@ #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 { |