diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 02:11:23 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 02:11:23 +0000 |
| commit | 2ac99a0c987c3e294eb579b0d5bc4163cfb6643c (patch) | |
| tree | f86492cc06ae9a655ee35c12eb540343e0f7dcd5 /base/win | |
| parent | d86065cfcf51ff4a37dc2244641013377db0b55f (diff) | |
| download | chromium_src-2ac99a0c987c3e294eb579b0d5bc4163cfb6643c.zip chromium_src-2ac99a0c987c3e294eb579b0d5bc4163cfb6643c.tar.gz chromium_src-2ac99a0c987c3e294eb579b0d5bc4163cfb6643c.tar.bz2 | |
Make SetAppIdForPropertyStore compile with win8 sdk
Removes the defined(_WIN32_WINNT_WIN8) trick and just
uses the existing macros.
So we can move the metro bits to src\
BUG=127799
Review URL: https://chromiumcodereview.appspot.com/10657035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144371 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/win')
| -rw-r--r-- | base/win/win_util.cc | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/base/win/win_util.cc b/base/win/win_util.cc index 2f2e7dc..55a4c3c 100644 --- a/base/win/win_util.cc +++ b/base/win/win_util.cc @@ -6,6 +6,7 @@ #include <aclapi.h> #include <shobjidl.h> // Must be before propkey. +#include <initguid.h> #include <propkey.h> #include <propvarutil.h> #include <sddl.h> @@ -22,28 +23,12 @@ namespace { -#if !defined(_WIN32_WINNT_WIN8) // TODO(gab): These definitions are temporary and should be removed once the -// win8 SDK has been imported into third_party/ - -// Using the same definition as in -// third_party\platformsdk_win7\files\Include\propkeydef.h -// without DECLSPEC_SELECTANY... -#define DEFINE_WIN8_PROPERTYKEY(name, l, w1, w2, \ - b1, b2, b3, b4, b5, b6, b7, b8, \ - pid) \ - const PROPERTYKEY name = { { l, w1, w2, \ - { b1, b2, b3, b4, b5, b6, b7, b8 } }, \ - pid } - -DEFINE_WIN8_PROPERTYKEY(PKEY_AppUserModel_DualMode, 0x9F4C2855, 0x9F79, 0x4B39, - 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11); -DEFINE_WIN8_PROPERTYKEY(PKEY_AppUserModel_DualMode_UK, 0x9F4C2855, 0x9F79, - 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, - 18); - -#undef DEFINE_WIN8_PROPERTYKEY -#endif +// win8 SDK defines them. +DEFINE_PROPERTYKEY(PKEY_AppUserModel_DualMode, 0x9F4C2855, 0x9F79, + 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 11); +DEFINE_PROPERTYKEY(PKEY_AppUserModel_DualMode_UK, 0x9F4C2855, 0x9F79, + 0x4B39, 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, 18); // Sets the value of |property_key| to |property_value| in |property_store|. // Clears the PropVariant contained in |property_value|. |