summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:34:17 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-19 23:34:17 +0000
commite078590661444968a2c49a3e5464413714471dca (patch)
tree13a4dbe4dedccc8057361bd86c89e065390247fc /base/base.gypi
parentd9f76627b14170b95639619089139b6f0493ae8c (diff)
downloadchromium_src-e078590661444968a2c49a3e5464413714471dca.zip
chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.gz
chromium_src-e078590661444968a2c49a3e5464413714471dca.tar.bz2
Move scoped_temp_dir and scoped_native_library back from base/memory to base.
It looks like they got moved accidentally in http://codereview.chromium.org/6714032 BUG=none TEST=none Review URL: http://codereview.chromium.org/7048007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/base.gypi b/base/base.gypi
index b89ff65..7c420a2 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -140,13 +140,9 @@
'memory/ref_counted_memory.h',
'memory/scoped_callback_factory.h',
'memory/scoped_handle.h',
- 'memory/scoped_native_library.cc',
- 'memory/scoped_native_library.h',
'memory/scoped_nsobject.h',
'memory/scoped_open_process.h',
'memory/scoped_ptr.h',
- 'memory/scoped_temp_dir.cc',
- 'memory/scoped_temp_dir.h',
'memory/scoped_vector.h',
'memory/singleton.h',
'memory/weak_ptr.cc',
@@ -207,6 +203,10 @@
'safe_strerror_posix.cc',
'safe_strerror_posix.h',
'scoped_ptr.h',
+ 'scoped_native_library.cc',
+ 'scoped_native_library.h',
+ 'scoped_temp_dir.cc',
+ 'scoped_temp_dir.h',
'sha1.h',
'sha1_portable.cc',
'sha1_win.cc',