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/browser/jumplist_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 'chrome/browser/jumplist_win.cc')
| -rw-r--r-- | chrome/browser/jumplist_win.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 12e2d2c..3614b9c 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -21,7 +21,7 @@ #include "base/string_util.h" #include "base/thread.h" #include "base/utf_string_conversions.h" -#include "base/win_util.h" +#include "base/win/windows_version.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/history/history.h" @@ -390,7 +390,7 @@ bool UpdateJumpList(const wchar_t* app_id, // JumpList is implemented only on Windows 7 or later. // So, we should return now when this function is called on earlier versions // of Windows. - if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7) + if (base::win::GetVersion() < base::win::VERSION_WIN7) return true; // Create an ICustomDestinationList object and attach it to our application. @@ -579,7 +579,7 @@ JumpList::~JumpList() { // static bool JumpList::Enabled() { - return (win_util::GetWinVersion() >= win_util::WINVERSION_WIN7 && + return (base::win::GetVersion() >= base::win::VERSION_WIN7 && !CommandLine::ForCurrentProcess()->HasSwitch( switches::kDisableCustomJumpList)); } @@ -590,7 +590,7 @@ bool JumpList::AddObserver(Profile* profile) { // When we add this object to the observer list, we save the pointer to this // TabRestoreService object. This pointer is used when we remove this object // from the observer list. - if (win_util::GetWinVersion() < win_util::WINVERSION_WIN7 || !profile) + if (base::win::GetVersion() < base::win::VERSION_WIN7 || !profile) return false; TabRestoreService* tab_restore_service = profile->GetTabRestoreService(); |