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 /ui/aura/bench | |
| 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 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index 7ddbc9e..bcdbd61 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -7,7 +7,7 @@ #include "base/command_line.h" #include "base/i18n/icu_util.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop/message_loop.h" +#include "base/message_loop.h" #include "base/strings/string_split.h" #include "base/time.h" #include "third_party/khronos/GLES2/gl2.h" @@ -35,7 +35,7 @@ #include "third_party/khronos/GLES2/gl2ext.h" #if defined(USE_X11) -#include "base/message_loop/message_pump_aurax11.h" +#include "base/message_pump_aurax11.h" #endif using base::TimeTicks; |