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

Side by Side Diff: ui/views/controls/menu/submenu_view.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/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/native/native_view_host.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_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_ 5 #ifndef UI_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_
6 #define UI_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_ 6 #define UI_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // See description above getter. 198 // See description above getter.
199 mutable int max_minor_text_width_; 199 mutable int max_minor_text_width_;
200 200
201 // Minimum width returned in GetPreferredSize(). 201 // Minimum width returned in GetPreferredSize().
202 int minimum_preferred_width_; 202 int minimum_preferred_width_;
203 203
204 // Reposition open menu when contained views change size. 204 // Reposition open menu when contained views change size.
205 bool resize_open_menu_; 205 bool resize_open_menu_;
206 206
207 // The submenu's scroll animator 207 // The submenu's scroll animator
208 scoped_ptr<ScrollAnimator> scroll_animator_; 208 std::unique_ptr<ScrollAnimator> scroll_animator_;
209 209
210 // Difference between current position and cumulative deltas passed to 210 // Difference between current position and cumulative deltas passed to
211 // OnScroll. 211 // OnScroll.
212 // TODO(tdresser): This should be removed when raw pixel scrolling for views 212 // TODO(tdresser): This should be removed when raw pixel scrolling for views
213 // is enabled. See crbug.com/329354. 213 // is enabled. See crbug.com/329354.
214 float roundoff_error_; 214 float roundoff_error_;
215 215
216 PrefixSelector prefix_selector_; 216 PrefixSelector prefix_selector_;
217 217
218 DISALLOW_COPY_AND_ASSIGN(SubmenuView); 218 DISALLOW_COPY_AND_ASSIGN(SubmenuView);
219 }; 219 };
220 220
221 } // namespace views 221 } // namespace views
222 222
223 #endif // UI_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_ 223 #endif // UI_VIEWS_CONTROLS_MENU_SUBMENU_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/controls/menu/native_menu_win.cc ('k') | ui/views/controls/native/native_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698