Removing useless Win7 checks + standardize its use

ui/base/win/shell.cc

 // Copyright (c) 2012 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 "ui/base/win/shell.h"
 
 #include <dwmapi.h>
 #include <shlobj.h>  // Must be before propkey.
 #include <propkey.h>
 #include <shellapi.h>
 
 #include "base/command_line.h"
 #include "base/debug/alias.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/native_library.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
-#include "base/win/windows_version.h"
 #include "ui/base/ui_base_switches.h"
 
 namespace ui {
 namespace win {
 
 namespace {
 
 // Default ShellExecuteEx flags used with the "openas" verb.
 //
 // SEE_MASK_NOASYNC is specified so that ShellExecuteEx can be invoked from a
@@ skipping 59 matching lines @@
   // resulting error does not cause UI due to the SEE_MASK_FLAG_NO_UI flag in
   // kDefaultOpenFlags.
   return InvokeShellExecute(full_path.value(), full_path.value(),
                             base::string16(), L"explore",
                             kDefaultOpenFlags) == ERROR_SUCCESS;
 }
 
 bool PreventWindowFromPinning(HWND hwnd) {
   DCHECK(hwnd);
 
-  // This functionality is only available on Win7+.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return false;
-
   base::win::ScopedComPtr<IPropertyStore> pps;
   if (FAILED(
           SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(pps.GetAddressOf()))))
     return false;
 
   return base::win::SetBooleanValueForPropertyStore(
       pps.Get(), PKEY_AppUserModel_PreventPinning, true);
 }
 
 // TODO(calamity): investigate moving this out of the UI thread as COM
 // operations may spawn nested run loops which can cause issues.
 void SetAppDetailsForWindow(const base::string16& app_id,
                             const base::FilePath& app_icon_path,
                             int app_icon_index,
                             const base::string16& relaunch_command,
                             const base::string16& relaunch_display_name,
                             HWND hwnd) {
   DCHECK(hwnd);
 
-  // This functionality is only available on Win7+.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return;
-
   base::win::ScopedComPtr<IPropertyStore> pps;
   if (FAILED(
           SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(pps.GetAddressOf()))))
     return;
 
   if (!app_id.empty())
     base::win::SetAppIdForPropertyStore(pps.Get(), app_id.c_str());
   if (!app_icon_path.empty()) {
     // Always add the icon index explicitly to prevent bad interaction with the
     // index notation when file path has commas.
@@ skipping 30 matching lines @@
 void SetRelaunchDetailsForWindow(const base::string16& relaunch_command,
                                  const base::string16& display_name,
                                  HWND hwnd) {
   SetAppDetailsForWindow(base::string16(), base::FilePath(), 0,
                          relaunch_command, display_name, hwnd);
 }
 
 void ClearWindowPropertyStore(HWND hwnd) {
   DCHECK(hwnd);
 
-  // This functionality is only available on Win7+.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return;
-
   base::win::ScopedComPtr<IPropertyStore> pps;
   if (FAILED(
           SHGetPropertyStoreForWindow(hwnd, IID_PPV_ARGS(pps.GetAddressOf()))))
     return;
 
   DWORD property_count;
   if (FAILED(pps->GetCount(&property_count)))
     return;
 
   PROPVARIANT empty_property_variant = {};
   for (DWORD i = 0; i < property_count; i++) {
     PROPERTYKEY key;
     if (SUCCEEDED(pps->GetAt(i, &key)))
       pps->SetValue(key, empty_property_variant);
   }
 
   pps->Commit();
 }
 
 bool IsAeroGlassEnabled() {
   // For testing in Win8 (where it is not possible to disable composition) the
   // user can specify this command line switch to mimic the behavior.  In this
   // mode, cross-HWND transparency is not supported and various types of
   // widgets fallback to more simplified rendering behavior.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableDwmComposition))
     return false;
 
-  // Technically Aero glass works in Vista but we want to put XP and Vista
-  // at the same feature level. See bug 426573.
-  if (base::win::GetVersion() < base::win::VERSION_WIN7)
-    return false;
   // If composition is not enabled, we behave like on XP.
   BOOL enabled = FALSE;
   return SUCCEEDED(DwmIsCompositionEnabled(&enabled)) && enabled;
 }
 
 }  // namespace win
 }  // namespace ui