commit c8ab94e3aa5be76e3b00b3135c1c75d72ecf82e7
author David Bienvenu <davidbienvenu@chromium.org> Fri Jan 28 15:39:44 2022
committer Chromium LUCI CQ <chromium-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 28 15:39:44 2022
tree 8244e344fd3154edec51120492c2804047a837e4
parent cf1fb630d2a91126b830d4da5210493a64b6a39c

Remove windows.h from shortcut.h

This allows shortcut.h to be included where Windows.h is not allowed
to be included.

Change-Id: I48547a23b331ff56ca56f8da264b6f3c8b81e03f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3416394
Reviewed-by: Jesse McKenna <jessemckenna@google.com>
Commit-Queue: David Bienvenu <davidbienvenu@chromium.org>
Cr-Commit-Position: refs/heads/main@{#964591}

base/win/shortcut.cc

diff --git a/base/win/shortcut.cc b/base/win/shortcut.cc
index e278356..73daa2b 100644
--- a/base/win/shortcut.cc
+++ b/base/win/shortcut.cc
@@ -60,6 +60,13 @@
 
 ShortcutProperties::~ShortcutProperties() = default;
 
+void ShortcutProperties::set_description(const std::wstring& description_in) {
+  // Size restriction as per MSDN at http://goo.gl/OdNQq.
+  DCHECK_LE(description_in.size(), static_cast<size_t>(INFOTIPSIZE));
+  description = description_in;
+  options |= PROPERTIES_DESCRIPTION;
+}
+
 bool CreateOrUpdateShortcutLink(const FilePath& shortcut_path,
                                 const ShortcutProperties& properties,
                                 ShortcutOperation operation) {

base/win/shortcut.h

diff --git a/base/win/shortcut.h b/base/win/shortcut.h
index 5848ce2..d889821 100644
--- a/base/win/shortcut.h
+++ b/base/win/shortcut.h
@@ -5,8 +5,8 @@
 #ifndef BASE_WIN_SHORTCUT_H_
 #define BASE_WIN_SHORTCUT_H_
 
-#include <windows.h>
-#include <commctrl.h>
+#include "guiddef.h"
+
 #include <stdint.h>
 
 #include "base/base_export.h"
@@ -67,12 +67,7 @@
     options |= PROPERTIES_ARGUMENTS;
   }
 
-  void set_description(const std::wstring& description_in) {
-    // Size restriction as per MSDN at http://goo.gl/OdNQq.
-    DCHECK_LE(description_in.size(), static_cast<size_t>(INFOTIPSIZE));
-    description = description_in;
-    options |= PROPERTIES_DESCRIPTION;
-  }
+  void set_description(const std::wstring& description_in);
 
   void set_icon(const FilePath& icon_in, int icon_index_in) {
     icon = icon_in;