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

Side by Side Diff: ui/views/controls/scrollbar/base_scroll_bar.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
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_SCROLLBAR_BASE_SCROLL_BAR_H_ 5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/views/animation/scroll_animator.h" 10 #include "ui/views/animation/scroll_animator.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 170
171 // An instance of a RepeatController which scrolls the scrollbar continuously 171 // An instance of a RepeatController which scrolls the scrollbar continuously
172 // as the user presses the mouse button down on the up/down buttons or the 172 // as the user presses the mouse button down on the up/down buttons or the
173 // track. 173 // track.
174 RepeatController repeater_; 174 RepeatController repeater_;
175 175
176 // The position of the mouse within the scroll bar when the context menu 176 // The position of the mouse within the scroll bar when the context menu
177 // was invoked. 177 // was invoked.
178 int context_menu_mouse_position_; 178 int context_menu_mouse_position_;
179 179
180 scoped_ptr<MenuRunner> menu_runner_; 180 std::unique_ptr<MenuRunner> menu_runner_;
181 scoped_ptr<ScrollAnimator> scroll_animator_; 181 std::unique_ptr<ScrollAnimator> scroll_animator_;
182 182
183 // Difference between current position and cumulative deltas obtained from 183 // Difference between current position and cumulative deltas obtained from
184 // scroll update events. 184 // scroll update events.
185 // TODO(tdresser): This should be removed when raw pixel scrolling for views 185 // TODO(tdresser): This should be removed when raw pixel scrolling for views
186 // is enabled. See crbug.com/329354. 186 // is enabled. See crbug.com/329354.
187 gfx::Vector2dF roundoff_error_; 187 gfx::Vector2dF roundoff_error_;
188 188
189 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar); 189 DISALLOW_COPY_AND_ASSIGN(BaseScrollBar);
190 }; 190 };
191 191
192 } // namespace views 192 } // namespace views
193 193
194 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ 194 #endif // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_
OLDNEW
« no previous file with comments | « ui/views/controls/scroll_view_unittest.cc ('k') | ui/views/controls/scrollbar/scrollbar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698