Hidden windows should not keep Chrome alive.

chrome/browser/ui/apps/chrome_app_delegate.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/apps/scoped_keep_alive.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
 #include "chrome/browser/ui/web_contents_sizer.h"
 #include "chrome/common/extensions/chrome_extension_messages.h"
 #include "components/ui/zoom/zoom_controller.h"
 #include "content/public/browser/browser_context.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/constants.h"
 
 #if defined(USE_ASH)
 #include "ash/shelf/shelf_constants.h"
 #endif
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_PRINT_PREVIEW)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #endif  // defined(ENABLE_PRINT_PREVIEW)
 #endif  // defined(ENABLE_PRINTING)
 
 namespace {
 
+// Time to wait for an app window to show before allowing Chrome to quit.
+int kAppWindowFirstShowTimeoutSeconds = 10;
+
 bool disable_external_open_for_testing_ = false;
 
 // Opens a URL with Chromium (not external browser) with the right profile.
 content::WebContents* OpenURLFromTabInternal(
     content::BrowserContext* context,
     const content::OpenURLParams& params) {
   // Force all links to open in a new tab, even if they were trying to open a
   // window.
   chrome::NavigateParams new_tab_params(
       static_cast<Browser*>(NULL), params.url, params.transition);
@@ skipping 44 matching lines @@
 
   bool IsOwnedByWorker() override { return true; }
 
  private:
   scoped_ptr<content::WebContents> source_;
   const content::OpenURLParams params_;
 };
 
 }  // namespace
 
+// static
+void ChromeAppDelegate::RelinquishKeepAliveAfterTimeout(
+    const base::WeakPtr<ChromeAppDelegate>& chrome_app_delegate) {
+  // Resetting the ScopedKeepAlive may cause nested destruction of the
+  // ChromeAppDelegate which also resets the ScopedKeepAlive. To avoid this,
+  // move the ScopedKeepAlive out to here and let it fall out of scope.
+  if (chrome_app_delegate.get() && chrome_app_delegate->is_hidden_)
+    scoped_ptr<ScopedKeepAlive>(chrome_app_delegate->keep_alive_.Pass());
+}
+
 class ChromeAppDelegate::NewWindowContentsDelegate
     : public content::WebContentsDelegate {
  public:
   NewWindowContentsDelegate() {}
   ~NewWindowContentsDelegate() override {}
 
   content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) override;
 
@@ skipping 20 matching lines @@
     // Object lifetime notes: The OpenURLFromTabBasedOnBrowserDefault is owned
     // by check_if_default_browser_worker. StartCheckIsDefault() takes lifetime
     // ownership of check_if_default_browser_worker and will clean up after
     // the asynchronous tasks.
     check_if_default_browser_worker->StartCheckIsDefault();
   }
   return NULL;
 }
 
 ChromeAppDelegate::ChromeAppDelegate(scoped_ptr<ScopedKeepAlive> keep_alive)
-    : keep_alive_(keep_alive.Pass()),
-      new_window_contents_delegate_(new NewWindowContentsDelegate()) {
+    : has_been_shown_(false),
+      is_hidden_(true),
+      keep_alive_(keep_alive.Pass()),
+      new_window_contents_delegate_(new NewWindowContentsDelegate()),
+      weak_factory_(this) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_APP_TERMINATING,
                  content::NotificationService::AllSources());
 }
 
 ChromeAppDelegate::~ChromeAppDelegate() {
   // Unregister now to prevent getting notified if |keep_alive_| is the last.
   terminating_callback_.Reset();
 }
 
@@ skipping 131 matching lines @@
 
 bool ChromeAppDelegate::IsWebContentsVisible(
     content::WebContents* web_contents) {
   return platform_util::IsVisible(web_contents->GetNativeView());
 }
 
 void ChromeAppDelegate::SetTerminatingCallback(const base::Closure& callback) {
   terminating_callback_ = callback;
 }
 
+void ChromeAppDelegate::OnHide() {
+  is_hidden_ = true;
+  if (has_been_shown_) {
+    keep_alive_.reset();
+    return;
+  }
+
+  // Hold on to the keep alive for some time to give the app a chance to show
+  // the window.
+  content::BrowserThread::PostDelayedTask(
+      content::BrowserThread::UI, FROM_HERE,
+      base::Bind(&ChromeAppDelegate::RelinquishKeepAliveAfterTimeout,
+                 weak_factory_.GetWeakPtr()),
+      base::TimeDelta::FromSeconds(kAppWindowFirstShowTimeoutSeconds));
+}
+
+void ChromeAppDelegate::OnShow() {
+  has_been_shown_ = true;
+  is_hidden_ = false;
+  keep_alive_.reset(new ScopedKeepAlive);
+}
+
 void ChromeAppDelegate::Observe(int type,
                                 const content::NotificationSource& source,
                                 const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_APP_TERMINATING:
       if (!terminating_callback_.is_null())
         terminating_callback_.Run();
       break;
     default:
       NOTREACHED() << "Received unexpected notification";
   }
 }