Removing useless Win7 checks + standardize its use

base/win/shortcut.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 "base/win/shortcut.h"
 
 #include <objbase.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <propkey.h>
@@ skipping 119 matching lines @@
   if ((properties.options & ShortcutProperties::PROPERTIES_ICON) &&
       FAILED(i_shell_link->SetIconLocation(properties.icon.value().c_str(),
                                            properties.icon_index))) {
     return false;
   }
 
   bool has_app_id =
       (properties.options & ShortcutProperties::PROPERTIES_APP_ID) != 0;
   bool has_dual_mode =
       (properties.options & ShortcutProperties::PROPERTIES_DUAL_MODE) != 0;
-  if ((has_app_id || has_dual_mode) &&
-      GetVersion() >= VERSION_WIN7) {
+  if (has_app_id || has_dual_mode) {
     ScopedComPtr<IPropertyStore> property_store;
     if (FAILED(i_shell_link.CopyTo(property_store.GetAddressOf())) ||
         !property_store.Get())
       return false;
 
     if (has_app_id &&
         !SetAppIdForPropertyStore(property_store.Get(),
                                   properties.app_id.c_str())) {
       return false;
     }
@@ skipping 89 matching lines @@
     properties->set_description(temp);
   }
 
   if (options & ShortcutProperties::PROPERTIES_ICON) {
     int temp_index;
     if (FAILED(i_shell_link->GetIconLocation(temp, MAX_PATH, &temp_index)))
       return false;
     properties->set_icon(FilePath(temp), temp_index);
   }
 
-  // Windows 7+ options, avoiding unnecessary work.
-  if ((options & ShortcutProperties::PROPERTIES_WIN7) &&
-      GetVersion() >= VERSION_WIN7) {
+  if (options & ShortcutProperties::PROPERTIES_WIN7) {
     ScopedComPtr<IPropertyStore> property_store;
     if (FAILED(i_shell_link.CopyTo(property_store.GetAddressOf())))
       return false;
 
     if (options & ShortcutProperties::PROPERTIES_APP_ID) {
       ScopedPropVariant pv_app_id;
       if (property_store->GetValue(PKEY_AppUserModel_ID,
                                    pv_app_id.Receive()) != S_OK) {
         return false;
       }
@@ skipping 48 matching lines @@
     return false;
 
   if (target_path)
     *target_path = properties.target;
   if (args)
     *args = properties.arguments;
   return true;
 }
 
 bool CanPinShortcutToTaskbar() {
-  // "Pin to taskbar" appeared in Windows 7 and stopped being supported in
-  // Windows 10.
-  return GetVersion() >= VERSION_WIN7 && GetVersion() < VERSION_WIN10;
+  // "Pin to taskbar" stopped being supported in Windows 10.
+  return GetVersion() < VERSION_WIN10;
 }
 
 bool PinShortcutToTaskbar(const FilePath& shortcut) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(CanPinShortcutToTaskbar());
 
   intptr_t result = reinterpret_cast<intptr_t>(ShellExecute(
       NULL, L"taskbarpin", shortcut.value().c_str(), NULL, NULL, 0));
   return result > 32;
 }
 
 bool UnpinShortcutFromTaskbar(const FilePath& shortcut) {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  // "Unpin from taskbar" is only supported after Win7. It is possible to remove
-  // a shortcut pinned by a user on Windows 10+.
-  if (GetVersion() < VERSION_WIN7)
-    return false;
-
   intptr_t result = reinterpret_cast<intptr_t>(ShellExecute(
       NULL, L"taskbarunpin", shortcut.value().c_str(), NULL, NULL, 0));
   return result > 32;
 }
 
 }  // namespace win
 }  // namespace base