diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-31 20:39:02 +0000 |
| commit | fd85ad650d68309b965dbc9f3d6823cf2754349c (patch) | |
| tree | 28b98629e02b2e05ec74272146f249ca62a164da /app/app_base.gypi | |
| parent | ce072a7181ea5d58133e33654133236f5d9f5551 (diff) | |
| download | chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.zip chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.gz chromium_src-fd85ad650d68309b965dbc9f3d6823cf2754349c.tar.bz2 | |
Move app/win_util to app/win and fix the namespace usage.
Split out the two classes: ScopedComInitializer and ScopedCOMem (which I renamed) to separate files.
I removed the win_util_path file which had one function in it and moved the function to win_util.
Somehow, this was getting picked up by the nacl64 build and the call in sandbox_policy was then not being
defined. I just implemented the function in-plcae since it's just a simple wrapper around a Windows API call.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6013009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70343 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index 2581bdb..6bcad0e 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -32,13 +32,6 @@ 'tree_node_model.h', ], 'conditions': [ - ['OS=="win"', { - 'sources': [ - 'win_util.cc', - 'win_util.h', - 'win_util_path.cc', - ], - }], ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', { 'sources!': [ 'gtk_dnd_util.cc', @@ -238,12 +231,16 @@ 'win/hwnd_util.h', 'win/iat_patch_function.cc', 'win/iat_patch_function.h', + 'win/scoped_co_mem.h', + 'win/scoped_com_initializer.h', 'win/scoped_prop.cc', 'win/scoped_prop.h', 'win/shell.cc', 'win/shell.h', 'win/window_impl.cc', 'win/window_impl.h', + 'win/win_util.cc', + 'win/win_util.h', 'x11_util.cc', 'x11_util.h', 'x11_util_internal.h', |