Move closing-blank-tab logic in Browser class to DownloadUIConttroller

chrome/browser/download/download_ui_controller.cc

 // Copyright 2013 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/download/download_ui_controller.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/download/download_item_model.h"
+#include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 
 #if defined(OS_ANDROID)
 #include "content/public/browser/android/download_controller_android.h"
 #else
 #include "chrome/browser/download/notification/download_notification_manager.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 55 matching lines @@
   Browser* browser =
       web_contents ? chrome::FindBrowserWithWebContents(web_contents) : NULL;
 
   // As a last resort, use the last active browser for this profile. Not ideal,
   // but better than not showing the download at all.
   if (browser == NULL) {
     browser = chrome::FindLastActiveWithProfile(profile_,
                                                 chrome::GetActiveDesktop());
   }
 
-  if (browser)
-    browser->ShowDownload(item);
+  if (browser && browser->window() &&
+      DownloadItemModel(item).ShouldShowInShelf()) {
+    // GetDownloadShelf creates the download shelf if it was not yet created.
+    browser->window()->GetDownloadShelf()->AddDownload(item);
+  }
 }
 
 #endif  // !OS_ANDROID
 
 } // namespace
 
 DownloadUIController::Delegate::~Delegate() {
 }
 
 DownloadUIController::DownloadUIController(content::DownloadManager* manager,
@@ skipping 36 matching lines @@
   // Ignore if we've already notified the UI about |item| or if it isn't a new
   // download.
   if (item_model.WasUINotified() || !item_model.ShouldNotifyUI())
     return;
 
   // Wait until the target path is determined.
   if (item->GetTargetFilePath().empty())
     return;
 
   DownloadItemModel(item).SetWasUINotified(true);
+
+#if !defined(OS_ANDROID)
+  content::WebContents* web_contents = item->GetWebContents();
+  if (web_contents) {
+    Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+    // If the download occurs in a new tab, and it's not a save page
+    // download (started before initial navigation completed) close it.
+    // Avoid calling CloseContents if the tab is not in this browser's tab strip
+    // model; this can happen if the download was initiated by something
+    // internal to Chrome, such as by the app list.
+    if (browser && web_contents->GetController().IsInitialNavigation() &&
+        browser->tab_strip_model()->count() > 1 &&
+        browser->tab_strip_model()->GetIndexOfWebContents(web_contents) !=
+            TabStripModel::kNoTab &&
+        !item->IsSavePackageDownload()) {
+      web_contents->Close();
+    }
+  }
+#endif
+
   delegate_->OnNewDownloadReady(item);
 }