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

Side by Side Diff: ui/app_list/views/contents_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/contents_switcher_view.h ('k') | ui/app_list/views/folder_background_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 (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_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 AppsContainerView* apps_container_view() { return apps_container_view_; } 96 AppsContainerView* apps_container_view() { return apps_container_view_; }
97 StartPageView* start_page_view() { return start_page_view_; } 97 StartPageView* start_page_view() { return start_page_view_; }
98 SearchResultListView* search_results_view() { return search_results_view_; } 98 SearchResultListView* search_results_view() { return search_results_view_; }
99 views::View* GetPageView(int index); 99 views::View* GetPageView(int index);
100 100
101 // Adds a blank launcher page. For use in tests only. 101 // Adds a blank launcher page. For use in tests only.
102 void AddBlankPageForTesting(); 102 void AddBlankPageForTesting();
103 103
104 // Overridden from views::View: 104 // Overridden from views::View:
105 virtual gfx::Size GetPreferredSize() const OVERRIDE; 105 virtual gfx::Size GetPreferredSize() const override;
106 virtual void Layout() OVERRIDE; 106 virtual void Layout() override;
107 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE; 107 virtual bool OnKeyPressed(const ui::KeyEvent& event) override;
108 108
109 // Overridden from PaginationModelObserver: 109 // Overridden from PaginationModelObserver:
110 virtual void TotalPagesChanged() OVERRIDE; 110 virtual void TotalPagesChanged() override;
111 virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE; 111 virtual void SelectedPageChanged(int old_selected, int new_selected) override;
112 virtual void TransitionStarted() OVERRIDE; 112 virtual void TransitionStarted() override;
113 virtual void TransitionChanged() OVERRIDE; 113 virtual void TransitionChanged() override;
114 114
115 // Returns the pagination model for the ContentsView. 115 // Returns the pagination model for the ContentsView.
116 const PaginationModel& pagination_model() { return pagination_model_; } 116 const PaginationModel& pagination_model() { return pagination_model_; }
117 117
118 private: 118 private:
119 // Sets the active launcher page, accounting for whether the change is for 119 // Sets the active launcher page, accounting for whether the change is for
120 // search results. 120 // search results.
121 void SetActivePageInternal(int page_index, bool show_search_results); 121 void SetActivePageInternal(int page_index, bool show_search_results);
122 122
123 // Invoked when active view is changed. 123 // Invoked when active view is changed.
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 // Manages the pagination for the launcher pages. 167 // Manages the pagination for the launcher pages.
168 PaginationModel pagination_model_; 168 PaginationModel pagination_model_;
169 169
170 DISALLOW_COPY_AND_ASSIGN(ContentsView); 170 DISALLOW_COPY_AND_ASSIGN(ContentsView);
171 }; 171 };
172 172
173 } // namespace app_list 173 } // namespace app_list
174 174
175 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_ 175 #endif // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
OLDNEW
« no previous file with comments | « ui/app_list/views/contents_switcher_view.h ('k') | ui/app_list/views/folder_background_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698