From 9abb0092aa5b2c9962538d5ce16a2e4fc22a1b11 Mon Sep 17 00:00:00 2001 From: dcheng Date: Wed, 29 Oct 2014 16:35:21 -0700 Subject: [PATCH] Standardize usage of virtual/override/final specifiers. The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=jhawkins@chromium.org Review URL: https://codereview.chromium.org/686533002 Cr-Commit-Position: refs/heads/master@{#301976} --- .../views/download/download_danger_prompt_views.cc | 27 +++++------ .../download/download_feedback_dialog_view.cc | 2 +- .../views/download/download_feedback_dialog_view.h | 27 +++++------ .../download/download_in_progress_dialog_view.h | 23 +++++---- .../browser/ui/views/download/download_item_view.h | 55 +++++++++++----------- .../download/download_shelf_context_menu_view.h | 2 +- .../ui/views/download/download_shelf_view.h | 37 +++++++-------- .../download/download_started_animation_views.cc | 2 +- 8 files changed, 85 insertions(+), 90 deletions(-) diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc index 2a7dd2503de6..a5dc28f16b4b 100644 --- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc +++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc @@ -41,24 +41,23 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt, const OnDone& done); // DownloadDangerPrompt methods: - virtual void InvokeActionForTesting(Action action) override; + void InvokeActionForTesting(Action action) override; // views::DialogDelegate methods: - virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const override; - virtual base::string16 GetWindowTitle() const override; - virtual void DeleteDelegate() override; - virtual ui::ModalType GetModalType() const override; - virtual bool Cancel() override; - virtual bool Accept() override; - virtual bool Close() override; - virtual views::View* GetInitiallyFocusedView() override; - virtual views::View* GetContentsView() override; - virtual views::Widget* GetWidget() override; - virtual const views::Widget* GetWidget() const override; + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; + base::string16 GetWindowTitle() const override; + void DeleteDelegate() override; + ui::ModalType GetModalType() const override; + bool Cancel() override; + bool Accept() override; + bool Close() override; + views::View* GetInitiallyFocusedView() override; + views::View* GetContentsView() override; + views::Widget* GetWidget() override; + const views::Widget* GetWidget() const override; // content::DownloadItem::Observer: - virtual void OnDownloadUpdated(content::DownloadItem* download) override; + void OnDownloadUpdated(content::DownloadItem* download) override; private: base::string16 GetAcceptButtonTitle() const; diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc index 4c31ee1902c9..1dfa333e5ad2 100644 --- a/chrome/browser/ui/views/download/download_feedback_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.cc @@ -28,7 +28,7 @@ const void* kDialogStatusKey = &kDialogStatusKey; class DialogStatusData : public base::SupportsUserData::Data { public: DialogStatusData() : currently_shown_(false) {} - virtual ~DialogStatusData() {} + ~DialogStatusData() override {} bool currently_shown() const { return currently_shown_; } void set_currently_shown(bool shown) { currently_shown_ = shown; } private: diff --git a/chrome/browser/ui/views/download/download_feedback_dialog_view.h b/chrome/browser/ui/views/download/download_feedback_dialog_view.h index 6cc5ce4d4653..d9b37b6a4f04 100644 --- a/chrome/browser/ui/views/download/download_feedback_dialog_view.h +++ b/chrome/browser/ui/views/download/download_feedback_dialog_view.h @@ -41,27 +41,26 @@ class DownloadFeedbackDialogView : public views::DialogDelegate, Profile* profile, content::PageNavigator* navigator, const UserDecisionCallback& callback); - virtual ~DownloadFeedbackDialogView(); + ~DownloadFeedbackDialogView() override; // Handles the user's decision. bool OnButtonClicked(bool accepted); // views::DialogDelegate: - virtual ui::ModalType GetModalType() const override; - virtual base::string16 GetWindowTitle() const override; - virtual void DeleteDelegate() override; - virtual views::Widget* GetWidget() override; - virtual const views::Widget* GetWidget() const override; - virtual views::View* GetContentsView() override; - virtual int GetDefaultDialogButton() const override; - virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const override; - virtual bool Cancel() override; - virtual bool Accept() override; - virtual views::View* CreateExtraView() override; + ui::ModalType GetModalType() const override; + base::string16 GetWindowTitle() const override; + void DeleteDelegate() override; + views::Widget* GetWidget() override; + const views::Widget* GetWidget() const override; + views::View* GetContentsView() override; + int GetDefaultDialogButton() const override; + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; + bool Cancel() override; + bool Accept() override; + views::View* CreateExtraView() override; // views::LinkListener: - virtual void LinkClicked(views::Link* source, int event_flags) override; + void LinkClicked(views::Link* source, int event_flags) override; Profile* profile_; content::PageNavigator* navigator_; diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h index 87fc82baee91..e685748f6674 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.h +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.h @@ -27,22 +27,21 @@ class DownloadInProgressDialogView : public views::DialogDelegate { Browser::DownloadClosePreventionType dialog_type, bool app_modal, const base::Callback& callback); - virtual ~DownloadInProgressDialogView(); + ~DownloadInProgressDialogView() override; // views::DialogDelegate: - virtual int GetDefaultDialogButton() const override; - virtual base::string16 GetDialogButtonLabel( - ui::DialogButton button) const override; - virtual bool Cancel() override; - virtual bool Accept() override; + int GetDefaultDialogButton() const override; + base::string16 GetDialogButtonLabel(ui::DialogButton button) const override; + bool Cancel() override; + bool Accept() override; // views::WidgetDelegate: - virtual ui::ModalType GetModalType() const override; - virtual base::string16 GetWindowTitle() const override; - virtual void DeleteDelegate() override; - virtual views::Widget* GetWidget() override; - virtual const views::Widget* GetWidget() const override; - virtual views::View* GetContentsView() override; + ui::ModalType GetModalType() const override; + base::string16 GetWindowTitle() const override; + void DeleteDelegate() override; + views::Widget* GetWidget() override; + const views::Widget* GetWidget() const override; + views::View* GetContentsView() override; const bool app_modal_; const base::Callback callback_; diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h index 6062f9fa7654..09aeb9b10ca2 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -60,7 +60,7 @@ class DownloadItemView : public views::ButtonListener, public gfx::AnimationDelegate { public: DownloadItemView(content::DownloadItem* download, DownloadShelfView* parent); - virtual ~DownloadItemView(); + ~DownloadItemView() override; // Timer callback for handling animations void UpdateDownloadProgress(); @@ -74,46 +74,45 @@ class DownloadItemView : public views::ButtonListener, content::DownloadItem* download() { return model_.download(); } // DownloadItem::Observer methods - virtual void OnDownloadUpdated(content::DownloadItem* download) override; - virtual void OnDownloadOpened(content::DownloadItem* download) override; - virtual void OnDownloadDestroyed(content::DownloadItem* download) override; + void OnDownloadUpdated(content::DownloadItem* download) override; + void OnDownloadOpened(content::DownloadItem* download) override; + void OnDownloadDestroyed(content::DownloadItem* download) override; // Overridden from views::View: - virtual void Layout() override; - virtual gfx::Size GetPreferredSize() const override; - virtual bool OnMousePressed(const ui::MouseEvent& event) override; - virtual bool OnMouseDragged(const ui::MouseEvent& event) override; - virtual void OnMouseReleased(const ui::MouseEvent& event) override; - virtual void OnMouseCaptureLost() override; - virtual void OnMouseMoved(const ui::MouseEvent& event) override; - virtual void OnMouseExited(const ui::MouseEvent& event) override; - virtual bool OnKeyPressed(const ui::KeyEvent& event) override; - virtual bool GetTooltipText(const gfx::Point& p, - base::string16* tooltip) const override; - virtual void GetAccessibleState(ui::AXViewState* state) override; - virtual void OnThemeChanged() override; + void Layout() override; + gfx::Size GetPreferredSize() const override; + bool OnMousePressed(const ui::MouseEvent& event) override; + bool OnMouseDragged(const ui::MouseEvent& event) override; + void OnMouseReleased(const ui::MouseEvent& event) override; + void OnMouseCaptureLost() override; + void OnMouseMoved(const ui::MouseEvent& event) override; + void OnMouseExited(const ui::MouseEvent& event) override; + bool OnKeyPressed(const ui::KeyEvent& event) override; + bool GetTooltipText(const gfx::Point& p, + base::string16* tooltip) const override; + void GetAccessibleState(ui::AXViewState* state) override; + void OnThemeChanged() override; // Overridden from ui::EventHandler: - virtual void OnGestureEvent(ui::GestureEvent* event) override; + void OnGestureEvent(ui::GestureEvent* event) override; // Overridden from views::ContextMenuController. - virtual void ShowContextMenuForView(View* source, - const gfx::Point& point, - ui::MenuSourceType source_type) override; + void ShowContextMenuForView(View* source, + const gfx::Point& point, + ui::MenuSourceType source_type) override; // ButtonListener implementation. - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // gfx::AnimationDelegate implementation. - virtual void AnimationProgressed(const gfx::Animation* animation) override; + void AnimationProgressed(const gfx::Animation* animation) override; protected: // Overridden from views::View: - virtual void OnPaint(gfx::Canvas* canvas) override; - virtual void OnPaintBackground(gfx::Canvas* canvas) override; - virtual void OnFocus() override; - virtual void OnBlur() override; + void OnPaint(gfx::Canvas* canvas) override; + void OnPaintBackground(gfx::Canvas* canvas) override; + void OnFocus() override; + void OnBlur() override; private: enum State { diff --git a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h index c2a21e64db15..98d7ab868325 100644 --- a/chrome/browser/ui/views/download/download_shelf_context_menu_view.h +++ b/chrome/browser/ui/views/download/download_shelf_context_menu_view.h @@ -30,7 +30,7 @@ class DownloadShelfContextMenuView : public DownloadShelfContextMenu { public: DownloadShelfContextMenuView(content::DownloadItem* download_item, content::PageNavigator* navigator); - virtual ~DownloadShelfContextMenuView(); + ~DownloadShelfContextMenuView() override; base::TimeTicks close_time() const { return close_time_; } diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index 7ba927fd3c9c..fd762e3c7599 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(); diff --git a/chrome/browser/ui/views/download/download_started_animation_views.cc b/chrome/browser/ui/views/download/download_started_animation_views.cc index 632c56eb77a5..99ab02209b1c 100644 --- a/chrome/browser/ui/views/download/download_started_animation_views.cc +++ b/chrome/browser/ui/views/download/download_started_animation_views.cc @@ -38,7 +38,7 @@ class DownloadStartedAnimationViews : public gfx::LinearAnimation, void Close(); // Animation - virtual void AnimateToState(double state) override; + void AnimateToState(double state) override; // We use a TYPE_POPUP for the popup so that it may float above any windows in // our UI. -- 2.11.4.GIT