Update short cut pin state properly on Windows (uplift to 1.66.x)

app/brave_settings_strings.grdp

@@ -232,6 +232,9 @@
       <message name="IDS_SETTINGS_PIN_SHORTCUT" desc="The label for pin to taskbar button">
         Pin
       </message>
+      <message name="IDS_SETTINGS_PIN_SHORTCUT_SUBLABEL" desc="The sub label for pin to taskbar button">
+        Click Pin and confirm in the following Windows notification
+      </message>
       <message name="IDS_SETTINGS_SHORTCUT_PINNED" desc="The label for pinned state description">
         Brave is already pinned
       </message>

browser/resources/settings/pin_shortcut_page/pin_shortcut_page.html

@@ -10,6 +10,9 @@
   <div class="cr-row">
     <div class="flex cr-padded-text">
       <div>$i18n{canPinShortcut}</div>
+<if expr="is_win">
+      <div class="secondary">$i18n{pinShortcutSublabel}</div>
+</if>
     </div>
     <div class="separator"></div>
     <cr-button on-click="onPinShortcutTap_">

browser/ui/webui/settings/brave_settings_localized_strings_provider.cc

@@ -441,6 +441,9 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source,
 #if BUILDFLAG(ENABLE_PIN_SHORTCUT)
       {"canPinShortcut", IDS_SETTINGS_CAN_PIN_SHORTCUT},
       {"pinShortcut", IDS_SETTINGS_PIN_SHORTCUT},
+#if BUILDFLAG(IS_WIN)
+      {"pinShortcutSublabel", IDS_SETTINGS_PIN_SHORTCUT_SUBLABEL},
+#endif
       {"shortcutPinned", IDS_SETTINGS_SHORTCUT_PINNED},
 #endif
       // Rewards page

browser/ui/webui/settings/pin_shortcut_handler.cc

@@ -38,20 +38,67 @@ void PinShortcutHandler::HandleCheckShortcutPinState(
     const base::Value::List& args) {
   AllowJavascript();
 
+  CheckShortcutPinState(/*from_timer*/ false);
+}
+
+void PinShortcutHandler::CheckShortcutPinState(bool from_timer) {
   shell_integration::IsShortcutPinned(
       base::BindOnce(&PinShortcutHandler::OnCheckShortcutPinState,
-                     weak_factory_.GetWeakPtr()));
+                     weak_factory_.GetWeakPtr(), from_timer));
+}
+
+#if BUILDFLAG(IS_WIN)
+void PinShortcutHandler::OnPinStateCheckTimerFired() {
+  CheckShortcutPinState(/*from_timer*/ true);
 }
+#endif
 
 void PinShortcutHandler::OnPinShortcut(bool pinned) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  if (!pinned) {
+    return;
+  }
+
+#if BUILDFLAG(IS_WIN)
+  // On Windows, ignore |pinned| value as Windows asks to user via another
+  // os notification to pin. |pinned| state just represents that api call is
+  // succuss. So, polling to check whether user allowed or not.
+  if (!pin_state_check_timer_) {
+    pin_state_check_timer_ = std::make_unique<base::RetainingOneShotTimer>(
+        FROM_HERE, base::Seconds(2),
+        base::BindRepeating(&PinShortcutHandler::OnPinStateCheckTimerFired,
+                            weak_factory_.GetWeakPtr()));
+  }
+  // We'll try to check 10 times after asking to pin to Windows.
+  // Maybe user will see os notification for pin right after clicking the Pin
+  // button. If user doesn't click allow in 20s, we'll not monitor anymore as we
+  // could give proper pin state after reloading.
+  pin_state_check_count_down_ = 10;
+  pin_state_check_timer_->Reset();
+#else
   NotifyShortcutPinStateChangeToPage(pinned);
+#endif
 }
 
-void PinShortcutHandler::OnCheckShortcutPinState(bool pinned) {
+void PinShortcutHandler::OnCheckShortcutPinState(bool from_timer, bool pinned) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+#if BUILDFLAG(IS_WIN)
+  if (from_timer) {
+    pin_state_check_count_down_--;
+    // Clear if pinned or we did all try.
+    if (pinned || pin_state_check_count_down_ == 0) {
+      pin_state_check_count_down_ = 0;
+      pin_state_check_timer_.reset();
+    } else {
+      // Check again.
+      pin_state_check_timer_->Reset();
+    }
+  }
+#else
+  CHECK(!from_timer);
+#endif
   NotifyShortcutPinStateChangeToPage(pinned);
 }
 

browser/ui/webui/settings/pin_shortcut_handler.h

@@ -6,7 +6,11 @@
 #ifndef BRAVE_BROWSER_UI_WEBUI_SETTINGS_PIN_SHORTCUT_HANDLER_H_
 #define BRAVE_BROWSER_UI_WEBUI_SETTINGS_PIN_SHORTCUT_HANDLER_H_
 
+#include <memory>
+
 #include "base/memory/weak_ptr.h"
+#include "base/timer/timer.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 
 class PinShortcutHandler : public settings::SettingsPageUIHandler {
@@ -27,8 +31,18 @@ class PinShortcutHandler : public settings::SettingsPageUIHandler {
   void HandlePinShortcut(const base::Value::List& args);
   void NotifyShortcutPinStateChangeToPage(bool pinned);
 
+  // |from_timer| is true when it's called for polling pinned state
+  // after requesting pin. Only valid on Windows.
+  void CheckShortcutPinState(bool from_timer);
   void OnPinShortcut(bool pinned);
-  void OnCheckShortcutPinState(bool pinned);
+  void OnCheckShortcutPinState(bool from_timer, bool pinned);
+
+#if BUILDFLAG(IS_WIN)
+  void OnPinStateCheckTimerFired();
+
+  int pin_state_check_count_down_ = 0;
+  std::unique_ptr<base::RetainingOneShotTimer> pin_state_check_timer_;
+#endif
 
   base::WeakPtrFactory<PinShortcutHandler> weak_factory_{this};
 };