| Index: ui/views/accessible_pane_view.h
|
| diff --git a/ui/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h
|
| index 345e928309d362b9952d1fd8355de8b5f1d781e3..1fc5c2d68bf1aa5f1f79386b6d72a1dfa16d7783 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_; }
|
|
|