[Win] Fix black screen when min/maximizing hidden app window.

chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc

Index: chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc
diff --git a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc
index 0762f294e05078de87d35832a72798d2b170f272..1782078b9d43df7864fc93f3aa8ee80b30c4471f 100644
--- a/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc
+++ b/chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.cc
@@ -7,6 +7,7 @@
 #include "chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.h"
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h"
 #include "ui/aura/window.h"
+#include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
 
 AppWindowDesktopNativeWidgetAuraWin::AppWindowDesktopNativeWidgetAuraWin(
     ChromeNativeAppWindowViewsWin* app_window)
@@ -21,7 +22,27 @@ AppWindowDesktopNativeWidgetAuraWin::~AppWindowDesktopNativeWidgetAuraWin() {
 void AppWindowDesktopNativeWidgetAuraWin::InitNativeWidget(
     const views::Widget::InitParams& params) {
   views::Widget::InitParams modified_params = params;
-  modified_params.desktop_window_tree_host =
-      new AppWindowDesktopWindowTreeHostWin(app_window_, this);
+  tree_host_ = new AppWindowDesktopWindowTreeHostWin(app_window_, this);
+  modified_params.desktop_window_tree_host = tree_host_;
   DesktopNativeWidgetAura::InitNativeWidget(modified_params);
 }
+
+void AppWindowDesktopNativeWidgetAuraWin::Maximize() {
+  // Maximizing on Windows causes the window to be shown. Call Show() first to
+  // ensure the content view is also made visible. See http://crbug.com/436867.
+  // TODO(jackhou): Make this behavior the same as other platforms, i.e. calling
+  // Maximize() does not also show the window.
+  if (!tree_host_->IsVisible())
+    DesktopNativeWidgetAura::Show();
+  DesktopNativeWidgetAura::Maximize();
+}
+
+void AppWindowDesktopNativeWidgetAuraWin::Minimize() {
+  // Minimizing on Windows causes the window to be shown. Call Show() first to
+  // ensure the content view is also made visible. See http://crbug.com/436867.
+  // TODO(jackhou): Make this behavior the same as other platforms, i.e. calling
+  // Minimize() does not also show the window.
+  if (!tree_host_->IsVisible())
+    DesktopNativeWidgetAura::Show();
+  DesktopNativeWidgetAura::Minimize();
+}