diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 01:59:15 +0000 |
| commit | 935aa54d9a5e2e617c61c9f8dcea398768413443 (patch) | |
| tree | 3df9ec9316cd4d5b7171e5c6c869a01d823cc507 /app/resource_bundle_win.cc | |
| parent | 7d1f3348c26eda2d1656860c821d335bf94d4cda (diff) | |
| download | chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.zip chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.gz chromium_src-935aa54d9a5e2e617c61c9f8dcea398768413443.tar.bz2 | |
Move windows version-related stuff out of base/win_util and into base/win/windows_version. Many files now only need to include this instead of all of win_util.
Remove a bunch of unused code from base/win_util. There was a surprising amount.
Replace the AppUserModel property key with the one from the SDK now that we use the Win7 SDK. Move GetLogonSessionOnlyDACL from win_util to ipc since it's only used in that one place.
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/resource_bundle_win.cc')
| -rw-r--r-- | app/resource_bundle_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index 6676dc6..369ee40 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -17,14 +17,15 @@ #include "base/resource_util.h" #include "base/stl_util-inl.h" #include "base/string_piece.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" + #include "gfx/font.h" namespace { // Returns the flags that should be passed to LoadLibraryEx. DWORD GetDataDllLoadFlags() { - if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) + if (base::win::GetVersion() >= base::win::VERSION_VISTA) return LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE | LOAD_LIBRARY_AS_IMAGE_RESOURCE; return DONT_RESOLVE_DLL_REFERENCES; |