Move windows version-related stuff out of base/win_util and into base/win/win...

app/animation.cc

 // 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.
 
 #include "app/animation.h"
 
 #include "app/tween.h"
 #include "gfx/rect.h"
 
 #if defined(OS_WIN)
-#include "base/win_util.h"
+#include "base/win/windows_version.h"
 #endif
 
 Animation::Animation(base::TimeDelta timer_interval)
     : timer_interval_(timer_interval),
       is_animating_(false),
       delegate_(NULL) {
 }
 
 Animation::~Animation() {
   // Don't send out notification from the destructor. Chances are the delegate
@@ skipping 61 matching lines @@
   else
     container_ = new AnimationContainer();
 
   if (is_animating_)
     container_->Start(this);
 }
 
 // static
 bool Animation::ShouldRenderRichAnimation() {
 #if defined(OS_WIN)
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
+  if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
     BOOL result;
     // Get "Turn off all unnecessary animations" value.
     if (::SystemParametersInfo(SPI_GETCLIENTAREAANIMATION, 0, &result, 0)) {
       // There seems to be a typo in the MSDN document (as of May 2009):
       //   http://msdn.microsoft.com/en-us/library/ms724947(VS.85).aspx
       // The document states that the result is TRUE when animations are
       // _disabled_, but in fact, it is TRUE when they are _enabled_.
       return !!result;
     }
   }
   return !::GetSystemMetrics(SM_REMOTESESSION);
 #endif
   return true;
 }
 
 void Animation::SetStartTime(base::TimeTicks start_time) {
   start_time_ = start_time;
 }