diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 03:46:05 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-16 03:46:05 +0000 |
| commit | ce0e7246e92f2da8e6b865dd51ae626f9867ca4f (patch) | |
| tree | 8181f26fbe349c35ff37a9ae837603c3f11be7f8 /base/base.gypi | |
| parent | 21e74460f5b7cfe6f622557b20d40eecf3b8e98b (diff) | |
| download | chromium_src-ce0e7246e92f2da8e6b865dd51ae626f9867ca4f.zip chromium_src-ce0e7246e92f2da8e6b865dd51ae626f9867ca4f.tar.gz chromium_src-ce0e7246e92f2da8e6b865dd51ae626f9867ca4f.tar.bz2 | |
Move the windows-specific scoped_* stuff from base to base/win and in the base::win namespace.
This keeps old headers that forward to the new versions and have using declarations that allow the existing code to compile. I fixed all the callers in base to use the new ones, and also the other files I happened to touch.
This splits out the stuff from scoped_handle into a few separate files. I just deleted ScopedFindFile since it was only used in one place and it wasn't even really helping there.
I removed StackBstr which was a #define and used the "regular" ScopedBstr in the 7 places that used it. This is an optimization to avoid an extra allocation, but none of the callers are remotely performance critical.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3781009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62843 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
| -rw-r--r-- | base/base.gypi | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/base/base.gypi b/base/base.gypi index 20223bb..fee14af 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -196,13 +196,9 @@ 'safe_strerror_posix.cc', 'safe_strerror_posix.h', 'scoped_aedesc.h', - 'scoped_bstr_win.cc', - 'scoped_bstr_win.h', 'scoped_callback_factory.h', 'scoped_cftyperef.h', - 'scoped_comptr_win.h', 'scoped_handle.h', - 'scoped_handle_win.h', 'scoped_nsautorelease_pool.h', 'scoped_nsautorelease_pool.mm', 'scoped_nsdisable_screen_updates.h', @@ -211,8 +207,6 @@ 'scoped_ptr.h', 'scoped_temp_dir.cc', 'scoped_temp_dir.h', - 'scoped_variant_win.cc', - 'scoped_variant_win.h', 'scoped_vector.h', 'sha1.h', 'sha1_portable.cc', @@ -301,6 +295,15 @@ 'watchdog.h', 'weak_ptr.cc', 'weak_ptr.h', + 'win/scoped_bstr.cc', + 'win/scoped_bstr.h', + 'win/scoped_comptr.h', + 'win/scoped_gdi_object.h', + 'win/scoped_handle.h', + 'win/scoped_hdc.h', + 'win/scoped_hglobal.h', + 'win/scoped_variant.cc', + 'win/scoped_variant.h', 'win/windows_version.cc', 'win/windows_version.h', 'win_util.cc', @@ -363,6 +366,10 @@ 'sources/': [ ['exclude', '_openbsd\\.cc$'] ], }, ], + ['OS != "win"', { + 'sources/': [ ['exclude', '^win/'] ], + }, + ], [ 'OS == "win"', { 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', @@ -377,10 +384,6 @@ 'string16.cc', 'trace_event.cc', ], - }, { # OS != "win" - 'sources/': [ - ['exclude', '/win/*'], - ], },], ], }], |