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

Side by Side Diff: ui/app_list/pagination_model.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/demo/app_list_demo_views.cc ('k') | ui/app_list/pagination_model_unittest.cc » ('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_PAGINATION_MODEL_H_ 5 #ifndef UI_APP_LIST_PAGINATION_MODEL_H_
6 #define UI_APP_LIST_PAGINATION_MODEL_H_ 6 #define UI_APP_LIST_PAGINATION_MODEL_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/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 // If there is a transition, current page is the transition target page or the 115 // If there is a transition, current page is the transition target page or the
116 // pending transition target page. When current page + |delta| goes beyond 116 // pending transition target page. When current page + |delta| goes beyond
117 // valid range and |selected_page_| is at the range ends, invalid page number 117 // valid range and |selected_page_| is at the range ends, invalid page number
118 // -1 or |total_pages_| is returned to indicate the situation. 118 // -1 or |total_pages_| is returned to indicate the situation.
119 int CalculateTargetPage(int delta) const; 119 int CalculateTargetPage(int delta) const;
120 120
121 void StartTransitionAnimation(const Transition& transition); 121 void StartTransitionAnimation(const Transition& transition);
122 void ResetTransitionAnimation(); 122 void ResetTransitionAnimation();
123 123
124 // gfx::AnimationDelegate overrides: 124 // gfx::AnimationDelegate overrides:
125 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE; 125 virtual void AnimationProgressed(const gfx::Animation* animation) override;
126 virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE; 126 virtual void AnimationEnded(const gfx::Animation* animation) override;
127 127
128 int total_pages_; 128 int total_pages_;
129 int selected_page_; 129 int selected_page_;
130 130
131 Transition transition_; 131 Transition transition_;
132 132
133 // Pending selected page when SelectedPage is called during a transition. If 133 // Pending selected page when SelectedPage is called during a transition. If
134 // multiple SelectPage is called while a transition is in progress, only the 134 // multiple SelectPage is called while a transition is in progress, only the
135 // last target page is remembered here. 135 // last target page is remembered here.
136 int pending_selected_page_; 136 int pending_selected_page_;
137 137
138 scoped_ptr<gfx::SlideAnimation> transition_animation_; 138 scoped_ptr<gfx::SlideAnimation> transition_animation_;
139 int transition_duration_ms_; // Transition duration in millisecond. 139 int transition_duration_ms_; // Transition duration in millisecond.
140 int overscroll_transition_duration_ms_; 140 int overscroll_transition_duration_ms_;
141 141
142 int last_overscroll_target_page_; 142 int last_overscroll_target_page_;
143 base::TimeTicks last_overscroll_animation_start_time_; 143 base::TimeTicks last_overscroll_animation_start_time_;
144 144
145 ObserverList<PaginationModelObserver> observers_; 145 ObserverList<PaginationModelObserver> observers_;
146 146
147 DISALLOW_COPY_AND_ASSIGN(PaginationModel); 147 DISALLOW_COPY_AND_ASSIGN(PaginationModel);
148 }; 148 };
149 149
150 } // namespace app_list 150 } // namespace app_list
151 151
152 #endif // UI_APP_LIST_PAGINATION_MODEL_H_ 152 #endif // UI_APP_LIST_PAGINATION_MODEL_H_
OLDNEW
« no previous file with comments | « ui/app_list/demo/app_list_demo_views.cc ('k') | ui/app_list/pagination_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698