Commit 045f3120 authored by dcheng's avatar dcheng Committed by Commit bot

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=gbillock@chromium.org

Review URL: https://codereview.chromium.org/680993004

Cr-Commit-Position: refs/heads/master@{#302654}
parent f379a6ef
......@@ -43,19 +43,18 @@ class PermissionMenuButton : public views::MenuButton,
PermissionMenuButton(const base::string16& text,
PermissionMenuModel* model,
bool show_menu_marker);
virtual ~PermissionMenuButton();
~PermissionMenuButton() override;
// Overridden from views::LabelButton.
virtual void SetText(const base::string16& text) override;
void SetText(const base::string16& text) override;
// Overridden from views::View.
virtual void GetAccessibleState(ui::AXViewState* state) override;
virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
void GetAccessibleState(ui::AXViewState* state) override;
void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
private:
// Overridden from views::MenuButtonListener.
virtual void OnMenuButtonClicked(View* source,
const gfx::Point& point) override;
void OnMenuButtonClicked(View* source, const gfx::Point& point) override;
PermissionMenuModel* menu_model_; // Owned by |PermissionSelectorView|.
scoped_ptr<views::MenuRunner> menu_runner_;
......
......@@ -40,10 +40,10 @@ class PermissionSelectorView : public views::View {
protected:
// Overridden from views::View.
virtual void ChildPreferredSizeChanged(View* child) override;
void ChildPreferredSizeChanged(View* child) override;
private:
virtual ~PermissionSelectorView();
~PermissionSelectorView() override;
// Model for the permission's menu.
scoped_ptr<PermissionMenuModel> menu_model_;
......
......@@ -65,15 +65,14 @@ class PermissionCombobox : public views::MenuButton,
int index,
const GURL& url,
ContentSetting setting);
virtual ~PermissionCombobox();
~PermissionCombobox() override;
int index() const { return index_; }
virtual void GetAccessibleState(ui::AXViewState* state) override;
void GetAccessibleState(ui::AXViewState* state) override;
// MenuButtonListener:
virtual void OnMenuButtonClicked(View* source,
const gfx::Point& point) override;
void OnMenuButtonClicked(View* source, const gfx::Point& point) override;
// Callback when a permission's setting is changed.
void PermissionChanged(const WebsiteSettingsUI::PermissionInfo& permission);
......@@ -144,11 +143,11 @@ class CustomizeAllowComboboxModel : public ui::ComboboxModel {
};
CustomizeAllowComboboxModel() {}
virtual ~CustomizeAllowComboboxModel() {}
~CustomizeAllowComboboxModel() override {}
virtual int GetItemCount() const override;
virtual base::string16 GetItemAt(int index) override;
virtual int GetDefaultIndex() const override;
int GetItemCount() const override;
base::string16 GetItemAt(int index) override;
int GetDefaultIndex() const override;
};
int CustomizeAllowComboboxModel::GetItemCount() const {
......@@ -179,27 +178,26 @@ class PermissionsBubbleDelegateView : public views::BubbleDelegateView,
const std::vector<PermissionBubbleRequest*>& requests,
const std::vector<bool>& accept_state,
bool customization_mode);
virtual ~PermissionsBubbleDelegateView();
~PermissionsBubbleDelegateView() override;
void Close();
void SizeToContents();
// BubbleDelegateView:
virtual bool ShouldShowCloseButton() const override;
virtual bool ShouldShowWindowTitle() const override;
virtual const gfx::FontList& GetTitleFontList() const override;
virtual base::string16 GetWindowTitle() const override;
virtual void OnWidgetDestroying(views::Widget* widget) override;
bool ShouldShowCloseButton() const override;
bool ShouldShowWindowTitle() const override;
const gfx::FontList& GetTitleFontList() const override;
base::string16 GetWindowTitle() const override;
void OnWidgetDestroying(views::Widget* widget) override;
// ButtonListener:
virtual void ButtonPressed(views::Button* button,
const ui::Event& event) override;
void ButtonPressed(views::Button* button, const ui::Event& event) override;
// ComboboxListener:
virtual void OnPerformAction(views::Combobox* combobox) override;
void OnPerformAction(views::Combobox* combobox) override;
// PermissionCombobox::Listener:
virtual void PermissionSelectionChanged(int index, bool allowed) override;
void PermissionSelectionChanged(int index, bool allowed) override;
private:
PermissionBubbleViewViews* owner_;
......
......@@ -18,16 +18,16 @@ class PermissionsBubbleDelegateView;
class PermissionBubbleViewViews : public PermissionBubbleView {
public:
explicit PermissionBubbleViewViews(views::View* anchor_view);
virtual ~PermissionBubbleViewViews();
~PermissionBubbleViewViews() override;
// PermissionBubbleView:
virtual void SetDelegate(Delegate* delegate) override;
virtual void Show(const std::vector<PermissionBubbleRequest*>& requests,
void SetDelegate(Delegate* delegate) override;
void Show(const std::vector<PermissionBubbleRequest*>& requests,
const std::vector<bool>& accept_state,
bool customization_mode) override;
virtual bool CanAcceptRequestUpdate() override;
virtual void Hide() override;
virtual bool IsVisible() override;
bool CanAcceptRequestUpdate() override;
void Hide() override;
bool IsVisible() override;
void Closing();
void Toggle(int index, bool value);
......
......@@ -122,7 +122,7 @@ const int kSiteDataSectionRowSpacing = 11;
class PopupHeaderView : public views::View {
public:
explicit PopupHeaderView(views::ButtonListener* close_button_listener);
virtual ~PopupHeaderView();
~PopupHeaderView() override;
// Sets the name of the site's identity.
void SetIdentityName(const base::string16& name);
......@@ -146,10 +146,10 @@ class PopupHeaderView : public views::View {
class InternalPageInfoPopupView : public views::BubbleDelegateView {
public:
explicit InternalPageInfoPopupView(views::View* anchor_view);
virtual ~InternalPageInfoPopupView();
~InternalPageInfoPopupView() override;
// views::BubbleDelegateView:
virtual void OnWidgetDestroying(views::Widget* widget) override;
void OnWidgetDestroying(views::Widget* widget) override;
private:
DISALLOW_COPY_AND_ASSIGN(InternalPageInfoPopupView);
......
......@@ -46,7 +46,7 @@ class WebsiteSettingsPopupView
public views::TabbedPaneListener,
public WebsiteSettingsUI {
public:
virtual ~WebsiteSettingsPopupView();
~WebsiteSettingsPopupView() override;
static void ShowPopup(views::View* anchor_view,
Profile* profile,
......@@ -66,32 +66,31 @@ class WebsiteSettingsPopupView
Browser* browser);
// PermissionSelectorViewObserver implementation.
virtual void OnPermissionChanged(
void OnPermissionChanged(
const WebsiteSettingsUI::PermissionInfo& permission) override;
// views::BubbleDelegateView implementation.
virtual void OnWidgetDestroying(views::Widget* widget) override;
void OnWidgetDestroying(views::Widget* widget) override;
// views::ButtonListener implementation.
virtual void ButtonPressed(views::Button* button,
const ui::Event& event) override;
void ButtonPressed(views::Button* button, const ui::Event& event) override;
// views::LinkListener implementation.
virtual void LinkClicked(views::Link* source, int event_flags) override;
void LinkClicked(views::Link* source, int event_flags) override;
// views::TabbedPaneListener implementations.
virtual void TabSelectedAt(int index) override;
void TabSelectedAt(int index) override;
// views::View implementation.
virtual gfx::Size GetPreferredSize() const override;
gfx::Size GetPreferredSize() const override;
// WebsiteSettingsUI implementations.
virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
virtual void SetPermissionInfo(
void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
void SetPermissionInfo(
const PermissionInfoList& permission_info_list) override;
virtual void SetIdentityInfo(const IdentityInfo& identity_info) override;
virtual void SetFirstVisit(const base::string16& first_visit) override;
virtual void SetSelectedTab(TabId tab_id) override;
void SetIdentityInfo(const IdentityInfo& identity_info) override;
void SetFirstVisit(const base::string16& first_visit) override;
void SetSelectedTab(TabId tab_id) override;
// Creates the contents of the "Permissions" tab. The ownership of the
// returned view is transferred to the caller.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment