summaryrefslogtreecommitdiffstats
path: root/ui/views/accessible_pane_view.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 14:18:28 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 21:18:47 +0000
commit1d5884e1c15b36604a9c9f9376d18cb91f345f47 (patch)
tree538a20279b255153fa6092122eb50f6e74fcbb7c /ui/views/accessible_pane_view.h
parentb037316755183060a02dc5865cc11e7d9cdb5321 (diff)
downloadchromium_src-1d5884e1c15b36604a9c9f9376d18cb91f345f47.zip
chromium_src-1d5884e1c15b36604a9c9f9376d18cb91f345f47.tar.gz
chromium_src-1d5884e1c15b36604a9c9f9376d18cb91f345f47.tar.bz2
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=sky@chromium.org Review URL: https://codereview.chromium.org/679233002 Cr-Commit-Position: refs/heads/master@{#301449}
Diffstat (limited to 'ui/views/accessible_pane_view.h')
-rw-r--r--ui/views/accessible_pane_view.h25
1 files changed, 11 insertions, 14 deletions
diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h
index 345e928..1fc5c2d 100644
--- a/ui/views/accessible_pane_view.h
+++ b/ui/views/accessible_pane_view.h
@@ -24,7 +24,7 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
public FocusTraversable {
public:
AccessiblePaneView();
- virtual ~AccessiblePaneView();
+ ~AccessiblePaneView() override;
// Set focus to the pane with complete keyboard access.
// Focus will be restored to the last focused view if the user escapes.
@@ -40,23 +40,20 @@ class VIEWS_EXPORT AccessiblePaneView : public View,
virtual bool SetPaneFocusAndFocusDefault();
// Overridden from View:
- virtual FocusTraversable* GetPaneFocusTraversable() override;
- virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
- override;
- virtual void SetVisible(bool flag) override;
- virtual void GetAccessibleState(ui::AXViewState* state) override;
- virtual void RequestFocus() override;
+ FocusTraversable* GetPaneFocusTraversable() override;
+ bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
+ void SetVisible(bool flag) override;
+ void GetAccessibleState(ui::AXViewState* state) override;
+ void RequestFocus() override;
// Overridden from FocusChangeListener:
- virtual void OnWillChangeFocus(View* focused_before,
- View* focused_now) override;
- virtual void OnDidChangeFocus(View* focused_before,
- View* focused_now) override;
+ void OnWillChangeFocus(View* focused_before, View* focused_now) override;
+ void OnDidChangeFocus(View* focused_before, View* focused_now) override;
// Overridden from FocusTraversable:
- virtual FocusSearch* GetFocusSearch() override;
- virtual FocusTraversable* GetFocusTraversableParent() override;
- virtual View* GetFocusTraversableParentView() override;
+ FocusSearch* GetFocusSearch() override;
+ FocusTraversable* GetFocusTraversableParent() override;
+ View* GetFocusTraversableParentView() override;
// For testing only.
const ui::Accelerator& home_key() const { return home_key_; }