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

7 files changed, 16 insertions, 30 deletions

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,
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index ce135a6..44a8da4 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -271,8 +271,8 @@ be available for now. -->
         </message>
       </if>
       <!-- Strings used to warn that an OS is not supported -->
-      <message name="IDS_UNSUPPORTED_OS_WIN2000" desc="The text used to warn the user that Windows 2000 is not supported">
-        Chromium does not support Windows 2000. Some features may not work.
+      <message name="IDS_UNSUPPORTED_OS_PRE_WIN_XP" desc="The text used to warn the user that Windows pre-XP is not supported">
+        Chromium requires Windows XP or later. Some features may not work.
       </message>
       <message name="IDS_UNSUPPORTED_OS" desc="The text used to warn the user that current OS is not supported">
         Chromium does not support <ph name="OS_NAME">$1<ex>Windows 2000</ex></ph>.
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index 4962ffc..7b8d9c2 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -321,8 +321,8 @@ Chrome supports. -->
         </message>
       </if>
       <!-- Strings used to warn that an OS is not supported -->
-      <message name="IDS_UNSUPPORTED_OS_WIN2000" desc="The text used to warn the user that Windows 2000 is not supported">
-        Google Chrome does not support Windows 2000. Some features may not work.
+      <message name="IDS_UNSUPPORTED_OS_PRE_WIN_XP" desc="The text used to warn the user that Windows pre-XP is not supported">
+        Google Chrome requires Windows XP or later. Some features may not work.
       </message>
       <message name="IDS_UNSUPPORTED_OS" desc="The text used to warn the user that current OS is not supported">
         Google Chrome does not support <ph name="OS_NAME">$1<ex>Windows 2000</ex></ph>.
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
index b10236d..0f4fc35 100644
--- a/chrome/browser/browser_main_win.cc
+++ b/chrome/browser/browser_main_win.cc
@@ -48,9 +48,10 @@ void RecordBreakpadStatusUMA(MetricsService* metrics) {
 }
 
 void WarnAboutMinimumSystemRequirements() {
-  if (win_util::GetWinVersion() == win_util::WINVERSION_2000) {
+  if (win_util::GetWinVersion() < win_util::WINVERSION_XP) {
     // Display a warning message if the user is running chrome on Windows 2000.
-    const std::wstring text = l10n_util::GetString(IDS_UNSUPPORTED_OS_WIN2000);
+    const std::wstring text =
+        l10n_util::GetString(IDS_UNSUPPORTED_OS_PRE_WIN_XP);
     const std::wstring caption = l10n_util::GetString(IDS_PRODUCT_NAME);
     win_util::MessageBox(NULL, text, caption,
                          MB_OK | MB_ICONWARNING | MB_TOPMOST);
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index f0a212f..3422c3d 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -337,10 +337,7 @@ void NativeTableWin::CreateNativeControl() {
 
   // Make the selection extend across the row.
   // Reduce overdraw/flicker artifacts by double buffering.
-  DWORD list_view_style = LVS_EX_FULLROWSELECT;
-  if (win_util::GetWinVersion() > win_util::WINVERSION_2000) {
-    list_view_style |= LVS_EX_DOUBLEBUFFER;
-  }
+  DWORD list_view_style = LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER;
   if (table_->type() == CHECK_BOX_AND_TEXT)
     list_view_style |= LVS_EX_CHECKBOXES;
   ListView_SetExtendedListViewStyleEx(hwnd, 0, list_view_style);
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 711a707..a39aff0 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -793,10 +793,7 @@ HWND TableView::CreateNativeControl(HWND parent_container) {
 
   // Make the selection extend across the row.
   // Reduce overdraw/flicker artifacts by double buffering.
-  DWORD list_view_style = LVS_EX_FULLROWSELECT;
-  if (win_util::GetWinVersion() > win_util::WINVERSION_2000) {
-    list_view_style |= LVS_EX_DOUBLEBUFFER;
-  }
+  DWORD list_view_style = LVS_EX_FULLROWSELECT | LVS_EX_DOUBLEBUFFER;
   if (table_type_ == CHECK_BOX_AND_TEXT)
     list_view_style |= LVS_EX_CHECKBOXES;
   ListView_SetExtendedListViewStyleEx(list_view_, 0, list_view_style);
@@ -813,8 +810,7 @@ HWND TableView::CreateNativeControl(HWND parent_container) {
     model_->SetObserver(this);
 
   // Add the groups.
-  if (model_ && model_->HasGroups() &&
-      win_util::GetWinVersion() > win_util::WINVERSION_2000) {
+  if (model_ && model_->HasGroups()) {
     ListView_EnableGroupView(list_view_, true);
 
     TableModel::Groups groups = model_->GetGroups();
@@ -1375,9 +1371,7 @@ void TableView::UpdateListViewCache0(int start, int length, bool add) {
   LVITEM item = {0};
   int start_column = 0;
   int max_row = start + length;
-  const bool has_groups =
-      (win_util::GetWinVersion() > win_util::WINVERSION_2000 &&
-       model_->HasGroups());
+  const bool has_groups = model_->HasGroups();
   if (add) {
     if (has_groups)
       item.mask = LVIF_GROUPID;