diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 12:09:54 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 12:09:54 +0000 |
| commit | 7a2c3e67865a29f7e68e9874db4d8d1f6a1f9f0b (patch) | |
| tree | 76132d56184500e36f8f16dfa3a6594ff5f71219 /base | |
| parent | 0c4d90a4f8793a6e3df79905bce5a95b00632085 (diff) | |
| download | chromium_src-7a2c3e67865a29f7e68e9874db4d8d1f6a1f9f0b.zip chromium_src-7a2c3e67865a29f7e68e9874db4d8d1f6a1f9f0b.tar.gz chromium_src-7a2c3e67865a29f7e68e9874db4d8d1f6a1f9f0b.tar.bz2 | |
Rlz fix.
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/4211004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64411 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/win_util.h | 32 |
1 files changed, 3 insertions, 29 deletions
diff --git a/base/win_util.h b/base/win_util.h index 18400f2..4ba7eeb 100644 --- a/base/win_util.h +++ b/base/win_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BASE_WIN_UTIL_H__ -#define BASE_WIN_UTIL_H__ +#ifndef BASE_WIN_UTIL_H_ +#define BASE_WIN_UTIL_H_ #pragma once #include <windows.h> @@ -16,36 +16,10 @@ struct IPropertyStore; struct _tagpropertykey; typedef _tagpropertykey PROPERTYKEY; -// TODO(brettw) remove this once RLZ is updated to use the new version in -// base/win/windows_version.h. -#if defined(RLZ_WIN_LIB_LIB_MUTEX_H_) || defined(RLZ_WIN_LIB_USER_KEY_H_) \ - || defined(RLZ_WIN_LIB_PROCESS_INFO_H_) -#include "base/win/windows_version.h" -#endif - namespace win_util { void GetNonClientMetrics(NONCLIENTMETRICS* metrics); -// TODO(brettw) remove this once RLZ is updated to use the new version in -// base/win/windows_version.h. -#if defined(RLZ_WIN_LIB_LIB_MUTEX_H_) || defined(RLZ_WIN_LIB_USER_KEY_H_) \ - || defined(RLZ_WIN_LIB_PROCESS_INFO_H_) -// These must match the values in base::win! -enum WinVersion { - WINVERSION_PRE_2000 = 0, // Not supported - WINVERSION_2000 = 1, // Not supported - WINVERSION_XP = 2, - WINVERSION_SERVER_2003 = 3, - WINVERSION_VISTA = 4, - WINVERSION_2008 = 5, - WINVERSION_WIN7 = 6, -}; -inline WinVersion GetWinVersion() { - return static_cast<WinVersion>(base::win::GetVersion()); -} -#endif // RLZ_* - // Returns the string representing the current user sid. bool GetUserSidString(std::wstring* user_sid); @@ -101,4 +75,4 @@ bool RemoveCommandFromAutoRun(HKEY root_key, const string16& name); } // namespace win_util -#endif // BASE_WIN_UTIL_H__ +#endif // BASE_WIN_UTIL_H_ |