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/win_util.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/win_util.cc')
| -rw-r--r-- | app/win_util.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/win_util.cc b/app/win_util.cc index 657c695f..5232e34 100644 --- a/app/win_util.cc +++ b/app/win_util.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,6 +24,7 @@ #include "base/scoped_handle_win.h" #include "base/string_util.h" #include "base/win_util.h" +#include "base/win/windows_version.h" #include "gfx/codec/png_codec.h" #include "gfx/gdi_util.h" @@ -99,7 +100,7 @@ bool IsDrag(const POINT& origin, const POINT& current) { } bool ShouldUseVistaFrame() { - if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) + if (base::win::GetVersion() < base::win::VERSION_VISTA) return false; // If composition is not enabled, we behave like on XP. BOOL f; @@ -545,7 +546,7 @@ gfx::Font GetWindowTitleFont() { void SetAppIdForWindow(const std::wstring& app_id, HWND hwnd) { // This functionality is only available on Win7+. - if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7) + if (base::win::GetVersion() < base::win::VERSION_WIN7) return; // Load Shell32.dll into memory. |