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

Side by Side Diff: ui/app_list/pagination_model.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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/folder_image_unittest.cc ('k') | ui/app_list/search/dictionary_data_store.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_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 <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "base/observer_list.h" 12 #include "base/observer_list.h"
12 #include "base/time/time.h" 13 #include "base/time/time.h"
13 #include "ui/app_list/app_list_export.h" 14 #include "ui/app_list/app_list_export.h"
14 #include "ui/gfx/animation/animation_delegate.h" 15 #include "ui/gfx/animation/animation_delegate.h"
15 16
16 namespace gfx { 17 namespace gfx {
17 class SlideAnimation; 18 class SlideAnimation;
18 } 19 }
19 20
20 namespace app_list { 21 namespace app_list {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 int total_pages_; 129 int total_pages_;
129 int selected_page_; 130 int selected_page_;
130 131
131 Transition transition_; 132 Transition transition_;
132 133
133 // Pending selected page when SelectedPage is called during a transition. If 134 // Pending selected page when SelectedPage is called during a transition. If
134 // multiple SelectPage is called while a transition is in progress, only the 135 // multiple SelectPage is called while a transition is in progress, only the
135 // last target page is remembered here. 136 // last target page is remembered here.
136 int pending_selected_page_; 137 int pending_selected_page_;
137 138
138 scoped_ptr<gfx::SlideAnimation> transition_animation_; 139 std::unique_ptr<gfx::SlideAnimation> transition_animation_;
139 int transition_duration_ms_; // Transition duration in millisecond. 140 int transition_duration_ms_; // Transition duration in millisecond.
140 int overscroll_transition_duration_ms_; 141 int overscroll_transition_duration_ms_;
141 142
142 int last_overscroll_target_page_; 143 int last_overscroll_target_page_;
143 base::TimeTicks last_overscroll_animation_start_time_; 144 base::TimeTicks last_overscroll_animation_start_time_;
144 145
145 base::ObserverList<PaginationModelObserver> observers_; 146 base::ObserverList<PaginationModelObserver> observers_;
146 147
147 DISALLOW_COPY_AND_ASSIGN(PaginationModel); 148 DISALLOW_COPY_AND_ASSIGN(PaginationModel);
148 }; 149 };
149 150
150 } // namespace app_list 151 } // namespace app_list
151 152
152 #endif // UI_APP_LIST_PAGINATION_MODEL_H_ 153 #endif // UI_APP_LIST_PAGINATION_MODEL_H_
OLDNEW
« no previous file with comments | « ui/app_list/folder_image_unittest.cc ('k') | ui/app_list/search/dictionary_data_store.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698