1 files changed, 20 insertions, 38 deletions

diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 3f157a4..9bf9032 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H__
-#define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H__
+#ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
+#define CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_
 
+#include "chrome/browser/download/download_shelf.h"
 #include "chrome/common/slide_animation.h"
 #include "chrome/views/button.h"
 #include "chrome/views/link.h"
@@ -13,7 +14,7 @@ namespace views {
 class ImageView;
 }
 
-class DownloadItem;
+class BaseDownloadItemModel;
 class TabContents;
 
 class DownloadAnimation;
@@ -24,71 +25,52 @@ class DownloadAnimation;
 // To add a view representing a download to DownloadShelfView, invoke
 // AddDownloadView. AddDownloadView takes ownership of the passed in View.
 // DownloadShelfView does not hold an infinite number of download views, rather
-// it'll automatically remove views once a certain point is reached. As such,
-// the remove method is private.
-class DownloadShelfView : public views::View,
+// it'll automatically remove views once a certain point is reached.
+class DownloadShelfView : public DownloadShelf,
+                          public views::View,
                           public views::BaseButton::ButtonListener,
                           public views::LinkController,
                           public AnimationDelegate {
  public:
   explicit DownloadShelfView(TabContents* tab_contents);
 
-  // A new download has started, so add it to our shelf.
-  void AddDownload(DownloadItem* download);
-
+  // Implementation of View.
   virtual gfx::Size GetPreferredSize();
-
   virtual void Layout();
-
-  // Invokes the following methods to do painting:
-  //   PaintBackground, PaintBorder and PaintSeparators.
   virtual void Paint(ChromeCanvas* canvas);
 
-  // AnimationDelegate implementations
+  // Implementation of AnimationDelegate.
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationEnded(const Animation* animation);
 
+  // Implementation of LinkController.
   // Invoked when the user clicks the 'show all downloads' link button.
   virtual void LinkActivated(views::Link* source, int event_flags);
 
+  // Implementation of ButtonListener.
   // Invoked when the user clicks the close button. Asks the browser to
   // hide the download shelf.
   virtual void ButtonPressed(views::BaseButton* button);
 
+  // Implementation of DownloadShelf.
+  virtual void AddDownload(BaseDownloadItemModel* download_model);
+  virtual bool IsShowing() const;
+
   // Removes a specified download view. The supplied view is deleted after
   // it's removed.
   void RemoveDownloadView(views::View* view);
 
+ private:
+  void Init();
+
   // Adds a View representing a download to this DownloadShelfView.
   // DownloadShelfView takes ownership of the View, and will delete it as
   // necessary.
   void AddDownloadView(views::View* view);
 
-  // Invoked when the download shelf is migrated from one tab contents to a new
-  // one.
-  void ChangeTabContents(TabContents* old_contents, TabContents* new_contents);
-
-  // The browser view needs to know when we are going away to properly return
-  // the resize corner size to WebKit so that we don't draw on top of it.
-  // This returns the showing state of our animation which is set to false at
-  // the beginning Show and true at the beginning of a Hide.
-  bool IsShowing() const;
-
- private:
-  void Init();
-
   // Paints the border.
   void PaintBorder(ChromeCanvas* canvas);
 
-  // Paints the separators. This invokes PaintSeparator to paint a particular
-  // separator.
-  void PaintSeparators(ChromeCanvas* canvas);
-
-  // Paints the separator between the two views.
-  void PaintSeparator(ChromeCanvas* canvas, views::View* v1, views::View* v2);
-
-  TabContents* tab_contents_;
-
   // The animation for adding new items to the shelf.
   scoped_ptr<SlideAnimation> new_item_animation_;
 
@@ -110,8 +92,8 @@ class DownloadShelfView : public views::View,
   // deleted by View.
   views::Button* close_button_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(DownloadShelfView);
+  DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
 };
 
-#endif  // CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H__
+#endif  // CHROME_BROWSER_VIEWS_DOWNLOAD_SHELF_VIEW_H_