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

Side by Side Diff: cc/blink/scrollbar_impl.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/base/region.cc ('k') | cc/blink/scrollbar_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CC_BLINK_SCROLLBAR_IMPL_H_ 5 #ifndef CC_BLINK_SCROLLBAR_IMPL_H_
6 #define CC_BLINK_SCROLLBAR_IMPL_H_ 6 #define CC_BLINK_SCROLLBAR_IMPL_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "cc/input/scrollbar.h" 11 #include "cc/input/scrollbar.h"
11 #include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h" 12 #include "third_party/WebKit/public/platform/WebScrollbarThemePainter.h"
12 13
13 namespace blink { 14 namespace blink {
14 class WebScrollbar; 15 class WebScrollbar;
15 class WebScrollbarThemeGeometry; 16 class WebScrollbarThemeGeometry;
16 } 17 }
17 18
18 namespace cc_blink { 19 namespace cc_blink {
19 20
20 class ScrollbarImpl : public cc::Scrollbar { 21 class ScrollbarImpl : public cc::Scrollbar {
21 public: 22 public:
22 ScrollbarImpl(scoped_ptr<blink::WebScrollbar> scrollbar, 23 ScrollbarImpl(std::unique_ptr<blink::WebScrollbar> scrollbar,
23 blink::WebScrollbarThemePainter painter, 24 blink::WebScrollbarThemePainter painter,
24 scoped_ptr<blink::WebScrollbarThemeGeometry> geometry); 25 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry);
25 ~ScrollbarImpl() override; 26 ~ScrollbarImpl() override;
26 27
27 // cc::Scrollbar implementation. 28 // cc::Scrollbar implementation.
28 cc::ScrollbarOrientation Orientation() const override; 29 cc::ScrollbarOrientation Orientation() const override;
29 bool IsLeftSideVerticalScrollbar() const override; 30 bool IsLeftSideVerticalScrollbar() const override;
30 bool HasThumb() const override; 31 bool HasThumb() const override;
31 bool IsOverlay() const override; 32 bool IsOverlay() const override;
32 gfx::Point Location() const override; 33 gfx::Point Location() const override;
33 int ThumbThickness() const override; 34 int ThumbThickness() const override;
34 int ThumbLength() const override; 35 int ThumbLength() const override;
35 gfx::Rect TrackRect() const override; 36 gfx::Rect TrackRect() const override;
36 float ThumbOpacity() const override; 37 float ThumbOpacity() const override;
37 bool NeedsPaintPart(cc::ScrollbarPart part) const override; 38 bool NeedsPaintPart(cc::ScrollbarPart part) const override;
38 void PaintPart(SkCanvas* canvas, 39 void PaintPart(SkCanvas* canvas,
39 cc::ScrollbarPart part, 40 cc::ScrollbarPart part,
40 const gfx::Rect& content_rect) override; 41 const gfx::Rect& content_rect) override;
41 42
42 private: 43 private:
43 scoped_ptr<blink::WebScrollbar> scrollbar_; 44 std::unique_ptr<blink::WebScrollbar> scrollbar_;
44 blink::WebScrollbarThemePainter painter_; 45 blink::WebScrollbarThemePainter painter_;
45 scoped_ptr<blink::WebScrollbarThemeGeometry> geometry_; 46 std::unique_ptr<blink::WebScrollbarThemeGeometry> geometry_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(ScrollbarImpl); 48 DISALLOW_COPY_AND_ASSIGN(ScrollbarImpl);
48 }; 49 };
49 50
50 } // namespace cc_blink 51 } // namespace cc_blink
51 52
52 #endif // CC_BLINK_SCROLLBAR_IMPL_H_ 53 #endif // CC_BLINK_SCROLLBAR_IMPL_H_
OLDNEW
« no previous file with comments | « cc/base/region.cc ('k') | cc/blink/scrollbar_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698