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

Side by Side Diff: ui/app_list/views/contents_switcher_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
« no previous file with comments | « ui/app_list/views/cached_label.h ('k') | ui/app_list/views/contents_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 16 matching lines...) Expand all
27 27
28 ContentsView* contents_view() const { return contents_view_; } 28 ContentsView* contents_view() const { return contents_view_; }
29 29
30 // Adds a switcher button using |resource_id| as the button's image, which 30 // Adds a switcher button using |resource_id| as the button's image, which
31 // opens the page with index |page_index| in the ContentsView. 31 // opens the page with index |page_index| in the ContentsView.
32 void AddSwitcherButton(int resource_id, int page_index); 32 void AddSwitcherButton(int resource_id, int page_index);
33 33
34 private: 34 private:
35 // Overridden from views::ButtonListener: 35 // Overridden from views::ButtonListener:
36 virtual void ButtonPressed(views::Button* sender, 36 virtual void ButtonPressed(views::Button* sender,
37 const ui::Event& event) OVERRIDE; 37 const ui::Event& event) override;
38 38
39 // Overridden from PaginationModelObserver: 39 // Overridden from PaginationModelObserver:
40 virtual void TotalPagesChanged() OVERRIDE; 40 virtual void TotalPagesChanged() override;
41 virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; 41 virtual void SelectedPageChanged(int old_selected, int new_selected) override;
42 virtual void TransitionStarted() OVERRIDE; 42 virtual void TransitionStarted() override;
43 virtual void TransitionChanged() OVERRIDE; 43 virtual void TransitionChanged() override;
44 44
45 ContentsView* contents_view_; // Owned by views hierarchy. 45 ContentsView* contents_view_; // Owned by views hierarchy.
46 46
47 DISALLOW_COPY_AND_ASSIGN(ContentsSwitcherView); 47 DISALLOW_COPY_AND_ASSIGN(ContentsSwitcherView);
48 }; 48 };
49 49
50 } // namespace app_list 50 } // namespace app_list
51 51
52 #endif // UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_ 52 #endif // UI_APP_LIST_VIEWS_CONTENTS_SWITCHER_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/cached_label.h ('k') | ui/app_list/views/contents_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698