Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Side by Side Diff: ui/views/accessible_pane_view.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ 5 #ifndef UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_
6 #define UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ 6 #define UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_
7 7
8 #include "base/containers/hash_tables.h" 8 #include "base/containers/hash_tables.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 22 matching lines...) Expand all
33 // the pane was able to receive focus. 33 // the pane was able to receive focus.
34 virtual bool SetPaneFocus(View* initial_focus); 34 virtual bool SetPaneFocus(View* initial_focus);
35 35
36 // Set focus to the pane with complete keyboard access, with the 36 // Set focus to the pane with complete keyboard access, with the
37 // focus initially set to the default child. Focus will be restored 37 // focus initially set to the default child. Focus will be restored
38 // to the last focused view if the user escapes. 38 // to the last focused view if the user escapes.
39 // Returns true if the pane was able to receive focus. 39 // Returns true if the pane was able to receive focus.
40 virtual bool SetPaneFocusAndFocusDefault(); 40 virtual bool SetPaneFocusAndFocusDefault();
41 41
42 // Overridden from View: 42 // Overridden from View:
43 virtual FocusTraversable* GetPaneFocusTraversable() OVERRIDE; 43 virtual FocusTraversable* GetPaneFocusTraversable() override;
44 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) 44 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator)
45 OVERRIDE; 45 override;
46 virtual void SetVisible(bool flag) OVERRIDE; 46 virtual void SetVisible(bool flag) override;
47 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 47 virtual void GetAccessibleState(ui::AXViewState* state) override;
48 virtual void RequestFocus() OVERRIDE; 48 virtual void RequestFocus() override;
49 49
50 // Overridden from FocusChangeListener: 50 // Overridden from FocusChangeListener:
51 virtual void OnWillChangeFocus(View* focused_before, 51 virtual void OnWillChangeFocus(View* focused_before,
52 View* focused_now) OVERRIDE; 52 View* focused_now) override;
53 virtual void OnDidChangeFocus(View* focused_before, 53 virtual void OnDidChangeFocus(View* focused_before,
54 View* focused_now) OVERRIDE; 54 View* focused_now) override;
55 55
56 // Overridden from FocusTraversable: 56 // Overridden from FocusTraversable:
57 virtual FocusSearch* GetFocusSearch() OVERRIDE; 57 virtual FocusSearch* GetFocusSearch() override;
58 virtual FocusTraversable* GetFocusTraversableParent() OVERRIDE; 58 virtual FocusTraversable* GetFocusTraversableParent() override;
59 virtual View* GetFocusTraversableParentView() OVERRIDE; 59 virtual View* GetFocusTraversableParentView() override;
60 60
61 // For testing only. 61 // For testing only.
62 const ui::Accelerator& home_key() const { return home_key_; } 62 const ui::Accelerator& home_key() const { return home_key_; }
63 const ui::Accelerator& end_key() const { return end_key_; } 63 const ui::Accelerator& end_key() const { return end_key_; }
64 const ui::Accelerator& escape_key() const { return escape_key_; } 64 const ui::Accelerator& escape_key() const { return escape_key_; }
65 const ui::Accelerator& left_key() const { return left_key_; } 65 const ui::Accelerator& left_key() const { return left_key_; }
66 const ui::Accelerator& right_key() const { return right_key_; } 66 const ui::Accelerator& right_key() const { return right_key_; }
67 67
68 protected: 68 protected:
69 // A subclass can override this to provide a default focusable child 69 // A subclass can override this to provide a default focusable child
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 friend class AccessiblePaneViewFocusSearch; 123 friend class AccessiblePaneViewFocusSearch;
124 124
125 base::WeakPtrFactory<AccessiblePaneView> method_factory_; 125 base::WeakPtrFactory<AccessiblePaneView> method_factory_;
126 126
127 DISALLOW_COPY_AND_ASSIGN(AccessiblePaneView); 127 DISALLOW_COPY_AND_ASSIGN(AccessiblePaneView);
128 }; 128 };
129 129
130 } // namespace views 130 } // namespace views
131 131
132 #endif // UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ 132 #endif // UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/accessibility/native_view_accessibility_win.h ('k') | ui/views/accessible_pane_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698