diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 17:06:45 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-28 17:06:45 +0000 |
| commit | 1afcbeddfd1669ab68de112af72582db96cb0a7f (patch) | |
| tree | 0fb465c9c3a70c1e56b6ab9339a767b24cf5224e /o3d/import | |
| parent | a842fb26e1a562c61eda331b036234fcc5c7882f (diff) | |
| download | chromium_src-1afcbeddfd1669ab68de112af72582db96cb0a7f.zip chromium_src-1afcbeddfd1669ab68de112af72582db96cb0a7f.tar.gz chromium_src-1afcbeddfd1669ab68de112af72582db96cb0a7f.tar.bz2 | |
Reverting the parts of r79524.
O3D is using a pinned version of base.
Typically you don't need to update it (and in fact shouldn't) on changes to
base.
BUG=None
TEST=None
R=levin@chromium.org
Review URL: http://codereview.chromium.org/6757008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/import')
| -rw-r--r-- | o3d/import/cross/archive_request.h | 2 | ||||
| -rw-r--r-- | o3d/import/cross/raw_data.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/o3d/import/cross/archive_request.h b/o3d/import/cross/archive_request.h index 801b47a..980c449 100644 --- a/o3d/import/cross/archive_request.h +++ b/o3d/import/cross/archive_request.h @@ -38,7 +38,7 @@ #include <algorithm> #include <string> -#include "base/memory/scoped_ptr.h" +#include "base/scoped_ptr.h" #include "core/cross/callback.h" #include "core/cross/object_base.h" #include "core/cross/pack.h" diff --git a/o3d/import/cross/raw_data.h b/o3d/import/cross/raw_data.h index e479d20..9f433cc 100644 --- a/o3d/import/cross/raw_data.h +++ b/o3d/import/cross/raw_data.h @@ -39,7 +39,7 @@ #ifndef O3D_IMPORT_CROSS_RAW_DATA_H_ #define O3D_IMPORT_CROSS_RAW_DATA_H_ -#include "base/memory/scoped_ptr.h" +#include "base/scoped_ptr.h" #include "core/cross/param_object.h" namespace o3d { |