Move download shelf from per-tab to per-window

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/time.h"
 #include "chrome/browser/autofill_manager.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/dom_ui.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/download/download_request_manager.h"
-#include "chrome/browser/download/download_shelf.h"
-#include "chrome/browser/download/download_started_animation.h"
 #include "chrome/browser/gears_integration.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/hung_renderer_dialog.h"
 #include "chrome/browser/jsmessage_box_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/renderer_host/web_cache_manager.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_action.h"
-#include "chrome/common/platform_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/registry_controlled_domain.h"
 
@@ skipping 49 matching lines @@
 const int kQueryStateDelay = 5000;
 
 const int kSyncWaitDelay = 40;
 
 // If another javascript message box is displayed within
 // kJavascriptMessageExpectedDelay of a previous javascript message box being
 // dismissed, display an option to suppress future message boxes from this
 // contents.
 const int kJavascriptMessageExpectedDelay = 1000;
 
-// Minimum amount of time in ms that has to elapse since the download shelf was
-// shown for us to hide it when navigating away from the current page.
-const int kDownloadShelfHideDelay = 5000;
-
 const char kLinkDoctorBaseURL[] =
     "http://linkhelp.clients.google.com/tbproxy/lh/fixurl";
 
 // The printer icon in shell32.dll. That's a standard icon user will quickly
 // recognize.
 const int kShell32PrinterIcon = 17;
 
 // The list of prefs we want to observe.
 const wchar_t* kPrefsToObserve[] = {
   prefs::kAlternateErrorPagesEnabled,
@@ skipping 96 matching lines @@
       is_crashed_(false),
       waiting_for_response_(false),
       max_page_id_(-1),
       current_load_start_(),
       load_state_(net::LOAD_STATE_IDLE),
       load_state_host_(),
       received_page_title_(false),
       is_starred_(false),
       contents_mime_type_(),
       encoding_(),
-      download_shelf_(),
-      shelf_visible_(false),
       blocked_popups_(NULL),
       infobar_delegates_(),
-      last_download_shelf_show_(),
       find_ui_active_(false),
       find_op_aborted_(false),
       current_find_request_id_(find_request_id_counter_++),
       find_text_(),
       last_search_case_sensitive_(false),
       last_search_prepopulate_text_(NULL),
       last_search_result_(),
       capturing_contents_(false),
       is_being_destroyed_(false),
       notify_disconnection_(false),
@@ skipping 667 matching lines @@
   // When it's the first load, we know either the pending one or the committed
   // one will have the DOM UI in it (see GetDOMUIForCurrentState), and only one
   // of them will be valid, so we can just check both.
   if (render_manager_.pending_dom_ui())
     return render_manager_.pending_dom_ui()->force_bookmark_bar_visible();
   if (render_manager_.dom_ui())
     return render_manager_.dom_ui()->force_bookmark_bar_visible();
   return false;  // Default.
 }
 
-void TabContents::SetDownloadShelfVisible(bool visible) {
-  if (shelf_visible_ != visible) {
-    if (visible) {
-      // Invoke GetDownloadShelf to force the shelf to be created.
-      GetDownloadShelf(true);
-    }
-    shelf_visible_ = visible;
-
-    NotifyNavigationStateChanged(INVALIDATE_TAB);
-
-    if (delegate())
-      delegate()->UpdateDownloadShelfVisibility(visible);
-  }
-
-  // SetShelfVisible can force-close the shelf, so make sure we lay out
-  // everything correctly, as if the animation had finished. This doesn't
-  // matter for showing the shelf, as the show animation will do it.
-  ToolbarSizeChanged(false);
-
-  if (visible) {
-    // Always set this value as it reflects the last time the download shelf
-    // was made visible (even if it was already visible).
-    last_download_shelf_show_ = base::TimeTicks::Now();
-  }
-}
-
 void TabContents::ToolbarSizeChanged(bool is_animating) {
   TabContentsDelegate* d = delegate();
   if (d)
     d->ToolbarSizeChanged(this, is_animating);
 }
 
 void TabContents::OnStartDownload(DownloadItem* download) {
   DCHECK(download);
 
   // Download in a constrained popup is shown in the tab that opened it.
   TabContents* tab_contents = delegate()->GetConstrainingContents(this);
 
-  // GetDownloadShelf creates the download shelf if it was not yet created.
-  tab_contents->GetDownloadShelf(true)->AddDownload(
-      new DownloadItemModel(download));
-  tab_contents->SetDownloadShelfVisible(true);
-
-// TODO(port): port for mac.
-#if defined(OS_WIN) || defined(OS_LINUX)
-  // We make this check for the case of minimized windows, unit tests, etc.
-  if (platform_util::IsVisible(GetNativeView())) {
-    DownloadStartedAnimation::Show(tab_contents);
-  }
-#endif
-}
-
-DownloadShelf* TabContents::GetDownloadShelf(bool create) {
-  if (!download_shelf_.get() && create)
-    download_shelf_.reset(DownloadShelf::Create(this));
-  return download_shelf_.get();
-}
-
-void TabContents::MigrateShelfFrom(TabContents* tab_contents) {
-  download_shelf_.reset(tab_contents->GetDownloadShelf(true));
-  download_shelf_->ChangeTabContents(tab_contents, this);
-  tab_contents->ReleaseDownloadShelf();
-}
-
-void TabContents::ReleaseDownloadShelf() {
-  download_shelf_.release();
-}
-
-// static
-void TabContents::MigrateShelf(TabContents* from, TabContents* to) {
-  bool was_shelf_visible = from->IsDownloadShelfVisible();
-  if (was_shelf_visible)
-    to->MigrateShelfFrom(from);
-  to->SetDownloadShelfVisible(was_shelf_visible);
+  if (tab_contents && tab_contents->delegate())
+    tab_contents->delegate()->OnStartDownload(download);
 }
 
 void TabContents::WillClose(ConstrainedWindow* window) {
   ConstrainedWindowList::iterator it =
       find(child_windows_.begin(), child_windows_.end(), window);
   if (it != child_windows_.end())
     child_windows_.erase(it);
 }
 
 void TabContents::WillCloseBlockedPopupContainer(
@@ skipping 259 matching lines @@
   if (controller_.pending_entry() &&
       (controller_.GetLastCommittedEntry() ||
        render_manager_.pending_dom_ui()))
     return render_manager_.pending_dom_ui();
   return render_manager_.dom_ui();
 }
 
 void TabContents::DidNavigateMainFramePostCommit(
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
-  // Hide the download shelf if all the following conditions are true:
-  // - there are no active downloads.
-  // - this is a navigation to a different TLD.
-  // - at least 5 seconds have elapsed since the download shelf was shown.
-  // TODO(jcampan): bug 1156075 when user gestures are reliable, they should
-  //                 be used to ensure we are hiding only on user initiated
-  //                 navigations.
-  DownloadManager* download_manager = profile()->GetDownloadManager();
-  // download_manager can be NULL in unit test context.
-  if (download_manager && download_manager->in_progress_count() == 0 &&
-      !details.previous_url.is_empty() &&
-      !net::RegistryControlledDomainService::SameDomainOrHost(
-          details.previous_url, details.entry->url())) {
-    base::TimeDelta time_delta(
-        base::TimeTicks::Now() - last_download_shelf_show_);
-    if (time_delta >
-        base::TimeDelta::FromMilliseconds(kDownloadShelfHideDelay)) {
-      SetDownloadShelfVisible(false);
-    }
-  }
-
   if (details.is_user_initiated_main_frame_load()) {
     // Clear the status bubble. This is a workaround for a bug where WebKit
     // doesn't let us know that the cursor left an element during a
     // transition (this is also why the mouse cursor remains as a hand after
     // clicking on a link); see bugs 1184641 and 980803. We don't want to
     // clear the bubble when a user navigates to a named anchor in the same
     // page.
     UpdateTargetURL(details.entry->page_id(), GURL());
 
     // UpdateHelpersForDidNavigate will handle the case where the password_form
@@ skipping 1127 matching lines @@
       NavigationController::LoadCommittedDetails& committed_details =
           *(Details<NavigationController::LoadCommittedDetails>(details).ptr());
       ExpireInfoBars(committed_details);
       break;
     }
 
     default:
       NOTREACHED();
   }
 }