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

Side by Side Diff: ui/views/controls/tabbed_pane/tabbed_pane.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 5 #ifndef UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
6 #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 6 #define UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/strings/string16.h" 10 #include "base/strings/string16.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 // is currently empty, the new tab is selected. 47 // is currently empty, the new tab is selected.
48 void AddTabAtIndex(int index, const base::string16& title, View* contents); 48 void AddTabAtIndex(int index, const base::string16& title, View* contents);
49 49
50 // Selects the tab at |index|, which must be valid. 50 // Selects the tab at |index|, which must be valid.
51 void SelectTabAt(int index); 51 void SelectTabAt(int index);
52 52
53 // Selects |tab| (the tabstrip view, not its content) if it is valid. 53 // Selects |tab| (the tabstrip view, not its content) if it is valid.
54 void SelectTab(Tab* tab); 54 void SelectTab(Tab* tab);
55 55
56 // Overridden from View: 56 // Overridden from View:
57 virtual gfx::Size GetPreferredSize() const OVERRIDE; 57 virtual gfx::Size GetPreferredSize() const override;
58 virtual const char* GetClassName() const OVERRIDE; 58 virtual const char* GetClassName() const override;
59 59
60 private: 60 private:
61 friend class TabStrip; 61 friend class TabStrip;
62 62
63 // Get the Tab (the tabstrip view, not its content) at the valid |index|. 63 // Get the Tab (the tabstrip view, not its content) at the valid |index|.
64 Tab* GetTabAt(int index); 64 Tab* GetTabAt(int index);
65 65
66 // Overridden from View: 66 // Overridden from View:
67 virtual void Layout() OVERRIDE; 67 virtual void Layout() override;
68 virtual void ViewHierarchyChanged( 68 virtual void ViewHierarchyChanged(
69 const ViewHierarchyChangedDetails& details) OVERRIDE; 69 const ViewHierarchyChangedDetails& details) override;
70 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 70 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
71 virtual void OnFocus() OVERRIDE; 71 virtual void OnFocus() override;
72 virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; 72 virtual void GetAccessibleState(ui::AXViewState* state) override;
73 73
74 // A listener notified when tab selection changes. Weak, not owned. 74 // A listener notified when tab selection changes. Weak, not owned.
75 TabbedPaneListener* listener_; 75 TabbedPaneListener* listener_;
76 76
77 // The tab strip and contents container. The child indices of these members 77 // The tab strip and contents container. The child indices of these members
78 // correspond to match each Tab with its respective content View. 78 // correspond to match each Tab with its respective content View.
79 TabStrip* tab_strip_; 79 TabStrip* tab_strip_;
80 View* contents_; 80 View* contents_;
81 81
82 // The selected tab index or -1 if invalid. 82 // The selected tab index or -1 if invalid.
83 int selected_tab_index_; 83 int selected_tab_index_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(TabbedPane); 85 DISALLOW_COPY_AND_ASSIGN(TabbedPane);
86 }; 86 };
87 87
88 } // namespace views 88 } // namespace views
89 89
90 #endif // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_ 90 #endif // UI_VIEWS_CONTROLS_TABBED_PANE_TABBED_PANE_H_
OLDNEW
« no previous file with comments | « ui/views/controls/styled_label_unittest.cc ('k') | ui/views/controls/tabbed_pane/tabbed_pane.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698