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

Side by Side Diff: ui/touch_selection/touch_handle_drawable_aura.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/touch_selection/touch_handle.h ('k') | ui/touch_selection/touch_handle_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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_ 5 #ifndef UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_
6 #define UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_ 6 #define UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/touch_selection/touch_handle.h" 9 #include "ui/touch_selection/touch_handle.h"
10 #include "ui/touch_selection/touch_handle_orientation.h" 10 #include "ui/touch_selection/touch_handle_orientation.h"
(...skipping 24 matching lines...) Expand all
35 void SetEnabled(bool enabled) override; 35 void SetEnabled(bool enabled) override;
36 void SetOrientation(TouchHandleOrientation orientation, 36 void SetOrientation(TouchHandleOrientation orientation,
37 bool mirror_vertical, 37 bool mirror_vertical,
38 bool mirror_horizontal) override; 38 bool mirror_horizontal) override;
39 void SetOrigin(const gfx::PointF& position) override; 39 void SetOrigin(const gfx::PointF& position) override;
40 void SetAlpha(float alpha) override; 40 void SetAlpha(float alpha) override;
41 gfx::RectF GetVisibleBounds() const override; 41 gfx::RectF GetVisibleBounds() const override;
42 float GetDrawableHorizontalPaddingRatio() const override; 42 float GetDrawableHorizontalPaddingRatio() const override;
43 43
44 aura_extra::ImageWindowDelegate* window_delegate_; 44 aura_extra::ImageWindowDelegate* window_delegate_;
45 scoped_ptr<aura::Window> window_; 45 std::unique_ptr<aura::Window> window_;
46 bool enabled_; 46 bool enabled_;
47 float alpha_; 47 float alpha_;
48 ui::TouchHandleOrientation orientation_; 48 ui::TouchHandleOrientation orientation_;
49 49
50 // Origin position of the handle set via SetOrigin, in coordinate space of 50 // Origin position of the handle set via SetOrigin, in coordinate space of
51 // selection controller client (i.e. handle's parent). 51 // selection controller client (i.e. handle's parent).
52 gfx::PointF origin_position_; 52 gfx::PointF origin_position_;
53 53
54 // Window bounds relative to the focal position. 54 // Window bounds relative to the focal position.
55 gfx::RectF relative_bounds_; 55 gfx::RectF relative_bounds_;
56 56
57 DISALLOW_COPY_AND_ASSIGN(TouchHandleDrawableAura); 57 DISALLOW_COPY_AND_ASSIGN(TouchHandleDrawableAura);
58 }; 58 };
59 59
60 } // namespace ui 60 } // namespace ui
61 61
62 #endif // UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_ 62 #endif // UI_TOUCH_SELECTION_TOUCH_HANDLE_DRAWABLE_AURA_H_
OLDNEW
« no previous file with comments | « ui/touch_selection/touch_handle.h ('k') | ui/touch_selection/touch_handle_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698