From acfeaee6661ddd4cb0309a6faed1f4aeb8d24853 Mon Sep 17 00:00:00 2001 From: dcheng Date: Mon, 27 Oct 2014 14:43:45 -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=thestig@chromium.org Review URL: https://codereview.chromium.org/672413003 Cr-Commit-Position: refs/heads/master@{#301451} --- .../ui/views/translate/translate_bubble_view.h | 19 +++++---- .../translate/translate_bubble_view_browsertest.cc | 4 +- .../translate/translate_bubble_view_unittest.cc | 47 +++++++++------------- 3 files changed, 31 insertions(+), 39 deletions(-) diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.h b/chrome/browser/ui/views/translate/translate_bubble_view.h index 58f7d741d512..c22c3372d87f 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.h +++ b/chrome/browser/ui/views/translate/translate_bubble_view.h @@ -39,7 +39,7 @@ class TranslateBubbleView : public views::BubbleDelegateView, public views::LinkListener, public content::WebContentsObserver { public: - virtual ~TranslateBubbleView(); + ~TranslateBubbleView() override; // Shows the Translate bubble. // @@ -63,25 +63,24 @@ class TranslateBubbleView : public views::BubbleDelegateView, TranslateBubbleModel* model() { return model_.get(); } // views::BubbleDelegateView methods. - virtual void Init() override; - virtual void ButtonPressed(views::Button* sender, - const ui::Event& event) override; + void Init() override; + void ButtonPressed(views::Button* sender, const ui::Event& event) override; // views::WidgetDelegate method. - virtual void WindowClosing() override; + void WindowClosing() override; // views::View methods. - virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override; - virtual gfx::Size GetPreferredSize() const override; + bool AcceleratorPressed(const ui::Accelerator& accelerator) override; + gfx::Size GetPreferredSize() const override; // views::CombboxListener methods. - virtual void OnPerformAction(views::Combobox* combobox) override; + void OnPerformAction(views::Combobox* combobox) override; // views::LinkListener method. - virtual void LinkClicked(views::Link* source, int event_flags) override; + void LinkClicked(views::Link* source, int event_flags) override; // content::WebContentsObserver method. - virtual void WebContentsDestroyed() override; + void WebContentsDestroyed() override; // Returns the current view state. TranslateBubbleModel::ViewState GetViewState() const; diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc index 6b41fc47f319..bd4dc21ea6a9 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_browsertest.cc @@ -22,8 +22,8 @@ class TranslateBubbleViewBrowserTest : public InProcessBrowserTest { public: TranslateBubbleViewBrowserTest() : cld_data_harness(test::CreateCldDataHarness()) {} - virtual ~TranslateBubbleViewBrowserTest() {} - virtual void SetUpOnMainThread() override { + ~TranslateBubbleViewBrowserTest() override {} + void SetUpOnMainThread() override { // We can't Init() until PathService has been initialized. This happens // very late in the test fixture setup process. cld_data_harness->Init(); diff --git a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc index 50e12235bb20..ecc0eca46436 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc @@ -32,79 +32,72 @@ class MockTranslateBubbleModel : public TranslateBubbleModel { original_language_index_on_translation_(-1), target_language_index_on_translation_(-1) {} - virtual TranslateBubbleModel::ViewState GetViewState() const override { + TranslateBubbleModel::ViewState GetViewState() const override { return view_state_transition_.view_state(); } - virtual void SetViewState(TranslateBubbleModel::ViewState view_state) - override { + void SetViewState(TranslateBubbleModel::ViewState view_state) override { view_state_transition_.SetViewState(view_state); } - virtual void ShowError(translate::TranslateErrors::Type error_type) override { + void ShowError(translate::TranslateErrors::Type error_type) override { error_type_ = error_type; } - virtual void GoBackFromAdvanced() override { + void GoBackFromAdvanced() override { view_state_transition_.GoBackFromAdvanced(); } - virtual int GetNumberOfLanguages() const override { - return 1000; - } + int GetNumberOfLanguages() const override { return 1000; } - virtual base::string16 GetLanguageNameAt(int index) const override { + base::string16 GetLanguageNameAt(int index) const override { return base::string16(); } - virtual int GetOriginalLanguageIndex() const override { + int GetOriginalLanguageIndex() const override { return original_language_index_; } - virtual void UpdateOriginalLanguageIndex(int index) override { + void UpdateOriginalLanguageIndex(int index) override { original_language_index_ = index; } - virtual int GetTargetLanguageIndex() const override { - return target_language_index_; - } + int GetTargetLanguageIndex() const override { return target_language_index_; } - virtual void UpdateTargetLanguageIndex(int index) override { + void UpdateTargetLanguageIndex(int index) override { target_language_index_ = index; } - virtual void SetNeverTranslateLanguage(bool value) override { + void SetNeverTranslateLanguage(bool value) override { never_translate_language_ = value; } - virtual void SetNeverTranslateSite(bool value) override { + void SetNeverTranslateSite(bool value) override { never_translate_site_ = value; } - virtual bool ShouldAlwaysTranslate() const override { + bool ShouldAlwaysTranslate() const override { return should_always_translate_; } - virtual void SetAlwaysTranslate(bool value) override { + void SetAlwaysTranslate(bool value) override { should_always_translate_ = value; set_always_translate_called_count_++; } - virtual void Translate() override { + void Translate() override { translate_called_ = true; original_language_index_on_translation_ = original_language_index_; target_language_index_on_translation_ = target_language_index_; } - virtual void RevertTranslation() override { - revert_translation_called_ = true; - } + void RevertTranslation() override { revert_translation_called_ = true; } - virtual void TranslationDeclined(bool explicitly_closed) override { + void TranslationDeclined(bool explicitly_closed) override { translation_declined_called_ = true; } - virtual bool IsPageTranslatedInCurrentLanguages() const override { + bool IsPageTranslatedInCurrentLanguages() const override { return original_language_index_on_translation_ == original_language_index_ && target_language_index_on_translation_ == target_language_index_; @@ -133,7 +126,7 @@ class TranslateBubbleViewTest : public views::ViewsTestBase { } protected: - virtual void SetUp() override { + void SetUp() override { views::ViewsTestBase::SetUp(); // The bubble needs the parent as an anchor. @@ -155,7 +148,7 @@ class TranslateBubbleViewTest : public views::ViewsTestBase { views::BubbleDelegateView::CreateBubble(bubble_)->Show(); } - virtual void TearDown() override { + void TearDown() override { bubble_->GetWidget()->CloseNow(); anchor_widget_.reset(); -- 2.11.4.GIT