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 /chrome_frame/chrome_tab.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 'chrome_frame/chrome_tab.cc')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index e073676..013995d 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -22,7 +22,7 @@ #include "base/string_piece.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/google_update_settings.h" @@ -300,7 +300,7 @@ HRESULT RefreshElevationPolicy() { // The idea here is to try this out on chrome frame dev channel // and see if it produces a significant drift in startup numbers. HRESULT SetupRunOnce() { - if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) + if (base::win::GetVersion() >= base::win::VERSION_VISTA) return S_OK; std::wstring channel_name; @@ -699,7 +699,7 @@ static bool SetOrDeleteMimeHandlerKey(bool set, HKEY root_key) { bool RegisterSecuredMimeHandler(bool enable, bool is_system) { if (!is_system) { return SetOrDeleteMimeHandlerKey(enable, HKEY_CURRENT_USER); - } else if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { + } else if (base::win::GetVersion() < base::win::VERSION_VISTA) { return SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE); } |