Merge remote-tracking branch 'origin/main' into no-onwindowshow

shell/browser/api/electron_api_browser_window.cc

@@ -380,16 +380,6 @@ void BrowserWindow::NotifyWindowUnresponsive() {
   }
 }
 
-void BrowserWindow::OnWindowShow() {
-  web_contents()->WasShown();
-  BaseWindow::OnWindowShow();
-}
-
-void BrowserWindow::OnWindowHide() {
-  web_contents()->WasOccluded();
-  BaseWindow::OnWindowHide();
-}
-
 // static
 gin_helper::WrappableBase* BrowserWindow::New(gin_helper::ErrorThrower thrower,
                                               gin::Arguments* args) {

shell/browser/api/electron_api_browser_window.h

@@ -68,8 +68,6 @@ class BrowserWindow : public BaseWindow,
   void Focus() override;
   void Blur() override;
   void SetBackgroundColor(const std::string& color_name) override;
-  void OnWindowShow() override;
-  void OnWindowHide() override;
 
   // BrowserWindow APIs.
   void FocusOnWebView();

spec/visibility-state-spec.ts

@@ -79,7 +79,7 @@ ifdescribe(process.platform !== 'linux')('document.visibilityState', () => {
     show: true
   }, async () => {
     // TODO(MarshallOfSound): Figure out if we can work around this 1 tick issue for users
-    if (process.platform === 'darwin') {
+    if (process.platform === 'darwin' || process.platform === 'win32') {
       // Wait for a tick, the window being "shown" takes 1 tick on macOS
       await setTimeout(10000);
     }