diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:29:14 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 21:29:14 +0000 |
| commit | b320c9742acb12fb2f23f0990fabc87ef31d097f (patch) | |
| tree | 3560efee853d8656a0ed515a8e447f25fa6e09d0 /o3d/import | |
| parent | 91d139522eea3e54dd5a7c0e3594c17f839f5758 (diff) | |
| download | chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.zip chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.tar.gz chromium_src-b320c9742acb12fb2f23f0990fabc87ef31d097f.tar.bz2 | |
Reverting the o3d parts of: 70009 70345 70353
O3D is frozen on an old version of base, so I believe you want to avoid
updating it in future base changes.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/6075009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70450 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/main_thread_archive_callback_client.h | 2 | ||||
| -rw-r--r-- | o3d/import/cross/threaded_stream_processor.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/import/cross/main_thread_archive_callback_client.h b/o3d/import/cross/main_thread_archive_callback_client.h index f1c9db6..7da39f7 100644 --- a/o3d/import/cross/main_thread_archive_callback_client.h +++ b/o3d/import/cross/main_thread_archive_callback_client.h @@ -36,7 +36,7 @@ #define O3D_IMPORT_CROSS_MAIN_THREAD_ARCHIVE_CALLBACK_CLIENT_H_ #include "base/basictypes.h" -#include "base/threading/thread.h" +#include "base/thread.h" #include "import/cross/archive_processor.h" #include "import/cross/memory_stream.h" diff --git a/o3d/import/cross/threaded_stream_processor.h b/o3d/import/cross/threaded_stream_processor.h index 2b5a4e5..f040eb4 100644 --- a/o3d/import/cross/threaded_stream_processor.h +++ b/o3d/import/cross/threaded_stream_processor.h @@ -37,7 +37,7 @@ #define O3D_IMPORT_CROSS_THREADED_STREAM_PROCESSOR_H_ #include "base/basictypes.h" -#include "base/threading/thread.h" +#include "base/thread.h" #include "import/cross/memory_stream.h" namespace o3d { |