From da57a3101fc1539fdeeaae9ff628f29ada29f60a Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 24 Sep 2015 18:15:57 +0800
Subject: [PATCH] Call WasShown when showing window

Otherwise WebContents would be invisible when window is hidden at first
and then show later.

Refs #2879.
---
 atom/browser/native_window_mac.mm   | 4 ++++
 atom/browser/native_window_views.cc | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm
index 9555914c899d..6a99f1cf4227 100644
--- a/atom/browser/native_window_mac.mm
+++ b/atom/browser/native_window_mac.mm
@@ -467,6 +467,8 @@ bool NativeWindowMac::IsFocused() {
 }
 
 void NativeWindowMac::Show() {
+  web_contents()->WasShown();
+
   // This method is supposed to put focus on window, however if the app does not
   // have focus then "makeKeyAndOrderFront" will only show the window.
   [NSApp activateIgnoringOtherApps:YES];
@@ -475,11 +477,13 @@ void NativeWindowMac::Show() {
 }
 
 void NativeWindowMac::ShowInactive() {
+  web_contents()->WasShown();
   [window_ orderFrontRegardless];
 }
 
 void NativeWindowMac::Hide() {
   [window_ orderOut:nil];
+  web_contents()->WasHidden();
 }
 
 bool NativeWindowMac::IsVisible() {
diff --git a/atom/browser/native_window_views.cc b/atom/browser/native_window_views.cc
index 45697c96683c..70707219f3f2 100644
--- a/atom/browser/native_window_views.cc
+++ b/atom/browser/native_window_views.cc
@@ -338,15 +338,18 @@ bool NativeWindowViews::IsFocused() {
 }
 
 void NativeWindowViews::Show() {
+  web_contents()->WasShown();
   window_->native_widget_private()->ShowWithWindowState(GetRestoredState());
 }
 
 void NativeWindowViews::ShowInactive() {
+  web_contents()->WasShown();
   window_->ShowInactive();
 }
 
 void NativeWindowViews::Hide() {
   window_->Hide();
+  web_contents()->WasHidden();
 }
 
 bool NativeWindowViews::IsVisible() {