Move download shelf from per-tab to per-window

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
@@ skipping 48 matching lines @@
 namespace IPC {
 class Message;
 }
 
 class AutofillForm;
 class AutofillManager;
 class BlockedPopupContainer;
 class DOMUI;
 class DOMUIContents;
 class DownloadItem;
-class DownloadShelf;
 class LoadNotificationDetails;
 class PageAction;
 class PasswordManager;
 class PluginInstaller;
 class Profile;
 class RenderViewHost;
 class TabContentsDelegate;
 class TabContentsFactory;
 class SkBitmap;
 class SiteInstance;
@@ skipping 318 matching lines @@
   int infobar_delegate_count() const { return infobar_delegates_.size(); }
   InfoBarDelegate* GetInfoBarDelegateAt(int index) {
     return infobar_delegates_.at(index);
   }
 
   // Toolbars and such ---------------------------------------------------------
 
   // Returns whether the bookmark bar should be visible.
   virtual bool IsBookmarkBarAlwaysVisible();
 
-  // Whether or not the shelf view is visible.
-  virtual void SetDownloadShelfVisible(bool visible);
-  bool IsDownloadShelfVisible() { return shelf_visible_; }
+  // Notifies the delegate that a download started.
+  void OnStartDownload(DownloadItem* download);
 
   // Notify our delegate that some of our content has animated.
   void ToolbarSizeChanged(bool is_animating);
 
-  // Displays the download shelf and animation when a download occurs.
-  void OnStartDownload(DownloadItem* download);
-
-  // Returns the DownloadShelf. If the shelf doesn't exist and |create| is true,
-  // this function will create the shelf.
-  DownloadShelf* GetDownloadShelf(bool create);
-
-  // Transfer the shelf view from |tab_contents| to the receiving TabContents.
-  // |tab_contents| no longer owns the shelf after this call. The shelf is owned
-  // by the receiving TabContents.
-  void MigrateShelfFrom(TabContents* tab_contents);
-
-  // Migrate the shelf view between 2 TabContents. This helper function is
-  // currently called by NavigationController::DiscardPendingEntry. We may
-  // want to generalize this if we need to migrate some other state.
-  static void MigrateShelf(TabContents* from, TabContents* to);
-
   // Called when a ConstrainedWindow we own is about to be closed.
   void WillClose(ConstrainedWindow* window);
 
   // Called when a BlockedPopupContainer we own is about to be closed.
   void WillCloseBlockedPopupContainer(BlockedPopupContainer* container);
 
   // Called when a ConstrainedWindow we own is moved or resized.
   void DidMoveOrResize(ConstrainedWindow* window);
 
   // Interstitials -------------------------------------------------------------
@@ skipping 199 matching lines @@
   // Called by a derived class when the TabContents is resized, causing
   // suppressed constrained web popups to be repositioned to the new bounds
   // if necessary.
   void RepositionSupressedPopupsToFit();
 
   // Whether we have a notification AND the notification owns popups windows.
   // (We keep the notification object around even when it's not shown since it
   // determines whether to show itself).
   bool ShowingBlockedPopupNotification() const;
 
-  // Releases the download shelf. This method is used by MigrateShelfFrom.
-  void ReleaseDownloadShelf();
-
   // Called by derived classes to indicate that we're no longer waiting for a
   // response. This won't actually update the throbber, but it will get picked
   // up at the next animation step if the throbber is going.
   void SetNotWaitingForResponse() { waiting_for_response_ = false; }
 
   typedef std::vector<ConstrainedWindow*> ConstrainedWindowList;
   ConstrainedWindowList child_windows_;
 
   // Expires InfoBars that need to be expired, according to the state carried
   // in |details|, in response to a new NavigationEntry being committed (the
@@ skipping 328 matching lines @@
 
   // When a navigation occurs, we record its contents MIME type. It can be
   // used to check whether we can do something for some special contents.
   std::string contents_mime_type_;
 
   // Character encoding. TODO(jungshik) : convert to std::string
   std::wstring encoding_;
 
   // Data for shelves and stuff ------------------------------------------------
 
-  // The download shelf view (view at the bottom of the page).
-  scoped_ptr<DownloadShelf> download_shelf_;
-
-  // Whether the shelf view is visible.
-  bool shelf_visible_;
-
   // ConstrainedWindow with additional methods for managing blocked
   // popups.
   BlockedPopupContainer* blocked_popups_;
 
   // Delegates for InfoBars associated with this TabContents.
   std::vector<InfoBarDelegate*> infobar_delegates_;
 
-  // The last time that the download shelf was made visible.
-  base::TimeTicks last_download_shelf_show_;
-
   // Data for find in page -----------------------------------------------------
 
   // TODO(brettw) this should be separated into a helper class.
 
   // Each time a search request comes in we assign it an id before passing it
   // over the IPC so that when the results come in we can evaluate whether we
   // still care about the results of the search (in some cases we don't because
   // the user has issued a new search).
   static int find_request_id_counter_;
 
@@ skipping 63 matching lines @@
   // True if the user has decided to block future javascript messages. This is
   // reset on navigations to false on navigations.
   bool suppress_javascript_messages_;
 
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_