From 0f6ddca67e6adf84a63a88f8a35be0bc481aa9f2 Mon Sep 17 00:00:00 2001 From: "pkasting@chromium.org" Date: Fri, 7 May 2010 23:15:00 +0000 Subject: Remove a few stray bits of win2k support. BUG=none TEST=none Review URL: http://codereview.chromium.org/1998012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46753 0039d316-1c4b-4281-b951-d872f2087c98 --- base/message_pump_win.cc | 12 +++--------- base/win_util.h | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'base') diff --git a/base/message_pump_win.cc b/base/message_pump_win.cc index f40c872..1bb6cfa 100644 --- a/base/message_pump_win.cc +++ b/base/message_pump_win.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. @@ -143,17 +143,11 @@ void MessagePumpForUI::PumpOutPendingPaintMessages() { // to get the job done. Actual common max is 4 peeks, but we'll be a little // safe here. const int kMaxPeekCount = 20; - bool win2k = win_util::GetWinVersion() <= win_util::WINVERSION_2000; int peek_count; for (peek_count = 0; peek_count < kMaxPeekCount; ++peek_count) { MSG msg; - if (win2k) { - if (!PeekMessage(&msg, NULL, WM_PAINT, WM_PAINT, PM_REMOVE)) - break; - } else { - if (!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE | PM_QS_PAINT)) - break; - } + if (!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE | PM_QS_PAINT)) + break; ProcessMessageHelper(msg); if (state_->should_quit) // Handle WM_QUIT. break; diff --git a/base/win_util.h b/base/win_util.h index ca550cf..32dea21 100644 --- a/base/win_util.h +++ b/base/win_util.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 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. @@ -20,7 +20,7 @@ namespace win_util { // though. enum WinVersion { WINVERSION_PRE_2000 = 0, // Not supported - WINVERSION_2000 = 1, + WINVERSION_2000 = 1, // Not supported WINVERSION_XP = 2, WINVERSION_SERVER_2003 = 3, WINVERSION_VISTA = 4, -- cgit v1.1