| Index: chrome/browser/ui/views/download/download_shelf_view.h
|
| diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h
|
| index 7ba927fd3c9c7387dcd2f98cba3b2e16ba900dab..fd762e3c7599ec1dbe6272654dc3921aeb55546c 100644
|
| --- a/chrome/browser/ui/views/download/download_shelf_view.h
|
| +++ b/chrome/browser/ui/views/download/download_shelf_view.h
|
| @@ -47,7 +47,7 @@ class DownloadShelfView : public views::AccessiblePaneView,
|
| public views::MouseWatcherListener {
|
| public:
|
| DownloadShelfView(Browser* browser, BrowserView* parent);
|
| - virtual ~DownloadShelfView();
|
| + ~DownloadShelfView() override;
|
|
|
| // Sent from the DownloadItemView when the user opens an item.
|
| void OpenedDownload(DownloadItemView* view);
|
| @@ -60,32 +60,31 @@ class DownloadShelfView : public views::AccessiblePaneView,
|
| BrowserView* get_parent() { return parent_; }
|
|
|
| // Implementation of View.
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| - virtual void ViewHierarchyChanged(
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
|
|
| // Implementation of gfx::AnimationDelegate.
|
| - virtual void AnimationProgressed(const gfx::Animation* animation) override;
|
| - virtual void AnimationEnded(const gfx::Animation* animation) override;
|
| + void AnimationProgressed(const gfx::Animation* animation) override;
|
| + void AnimationEnded(const gfx::Animation* animation) override;
|
|
|
| // Implementation of views::LinkListener.
|
| // Invoked when the user clicks the 'show all downloads' link button.
|
| - virtual void LinkClicked(views::Link* source, int event_flags) override;
|
| + void LinkClicked(views::Link* source, int event_flags) override;
|
|
|
| // Implementation of ButtonListener.
|
| // Invoked when the user clicks the close button. Asks the browser to
|
| // hide the download shelf.
|
| - virtual void ButtonPressed(views::Button* button,
|
| - const ui::Event& event) override;
|
| + void ButtonPressed(views::Button* button, const ui::Event& event) override;
|
|
|
| // Implementation of DownloadShelf.
|
| - virtual bool IsShowing() const override;
|
| - virtual bool IsClosing() const override;
|
| - virtual Browser* browser() const override;
|
| + bool IsShowing() const override;
|
| + bool IsClosing() const override;
|
| + Browser* browser() const override;
|
|
|
| // Implementation of MouseWatcherListener override.
|
| - virtual void MouseMovedOutOfHost() override;
|
| + void MouseMovedOutOfHost() override;
|
|
|
| // Removes a specified download view. The supplied view is deleted after
|
| // it's removed.
|
| @@ -93,12 +92,12 @@ class DownloadShelfView : public views::AccessiblePaneView,
|
|
|
| protected:
|
| // Implementation of DownloadShelf.
|
| - virtual void DoAddDownload(content::DownloadItem* download) override;
|
| - virtual void DoShow() override;
|
| - virtual void DoClose(CloseReason reason) override;
|
| + void DoAddDownload(content::DownloadItem* download) override;
|
| + void DoShow() override;
|
| + void DoClose(CloseReason reason) override;
|
|
|
| // From AccessiblePaneView
|
| - virtual views::View* GetDefaultFocusableChild() override;
|
| + views::View* GetDefaultFocusableChild() override;
|
|
|
| private:
|
| // Adds a View representing a download to this DownloadShelfView.
|
| @@ -107,7 +106,7 @@ class DownloadShelfView : public views::AccessiblePaneView,
|
| void AddDownloadView(DownloadItemView* view);
|
|
|
| // Paints the border.
|
| - virtual void OnPaintBorder(gfx::Canvas* canvas) override;
|
| + void OnPaintBorder(gfx::Canvas* canvas) override;
|
|
|
| // Returns true if the shelf is wide enough to show the first download item.
|
| bool CanFitFirstDownloadItem();
|
| @@ -116,7 +115,7 @@ class DownloadShelfView : public views::AccessiblePaneView,
|
| void UpdateColorsFromTheme();
|
|
|
| // Overridden from views::View.
|
| - virtual void OnThemeChanged() override;
|
| + void OnThemeChanged() override;
|
|
|
| // Called when the "close shelf" animation ended.
|
| void Closed();
|
|
|