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 /base/base.gyp | |
| 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 'base/base.gyp')
| -rw-r--r-- | base/base.gyp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/base/base.gyp b/base/base.gyp index 54ed4b7..fa4b00e 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -247,21 +247,21 @@ 'linux_util.h', 'md5.cc', 'md5.h', - 'message_loop/message_pump_android.cc', - 'message_loop/message_pump_android.h', - 'message_loop/message_pump_glib.cc', - 'message_loop/message_pump_glib.h', - 'message_loop/message_pump_gtk.cc', - 'message_loop/message_pump_gtk.h', - 'message_loop/message_pump_io_ios.cc', - 'message_loop/message_pump_io_ios.h', - 'message_loop/message_pump_observer.h', - 'message_loop/message_pump_aurax11.cc', - 'message_loop/message_pump_aurax11.h', - 'message_loop/message_pump_libevent.cc', - 'message_loop/message_pump_libevent.h', - 'message_loop/message_pump_mac.h', - 'message_loop/message_pump_mac.mm', + 'message_pump_android.cc', + 'message_pump_android.h', + 'message_pump_glib.cc', + 'message_pump_glib.h', + 'message_pump_gtk.cc', + 'message_pump_gtk.h', + 'message_pump_io_ios.cc', + 'message_pump_io_ios.h', + 'message_pump_observer.h', + 'message_pump_aurax11.cc', + 'message_pump_aurax11.h', + 'message_pump_libevent.cc', + 'message_pump_libevent.h', + 'message_pump_mac.h', + 'message_pump_mac.mm', 'metrics/field_trial.cc', 'metrics/field_trial.h', 'posix/file_descriptor_shuffle.cc', @@ -526,9 +526,9 @@ 'message_loop/message_loop_proxy_impl_unittest.cc', 'message_loop/message_loop_proxy_unittest.cc', 'message_loop/message_loop_unittest.cc', - 'message_loop/message_pump_glib_unittest.cc', - 'message_loop/message_pump_io_ios_unittest.cc', - 'message_loop/message_pump_libevent_unittest.cc', + 'message_pump_glib_unittest.cc', + 'message_pump_io_ios_unittest.cc', + 'message_pump_libevent_unittest.cc', 'metrics/sample_map_unittest.cc', 'metrics/sample_vector_unittest.cc', 'metrics/bucket_ranges_unittest.cc', @@ -684,7 +684,7 @@ # Requires spawning processes. ['exclude', '^metrics/stats_table_unittest\\.cc$'], # iOS does not use message_pump_libevent. - ['exclude', '^message_loop/message_pump_libevent_unittest\\.cc$'], + ['exclude', '^message_pump_libevent_unittest\\.cc$'], ], 'conditions': [ ['coverage != 0', { @@ -746,12 +746,12 @@ ], }, { # use_glib!=1 'sources!': [ - 'message_loop/message_pump_glib_unittest.cc', + 'message_pump_glib_unittest.cc', ] }], ['use_ozone == 1', { 'sources!': [ - 'message_loop/message_pump_glib_unittest.cc', + 'message_pump_glib_unittest.cc', ] }], ['OS == "win"', { @@ -764,7 +764,7 @@ 'file_descriptor_shuffle_unittest.cc', 'files/dir_reader_posix_unittest.cc', 'threading/worker_pool_posix_unittest.cc', - 'message_loop/message_pump_libevent_unittest.cc', + 'message_pump_libevent_unittest.cc', ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ |