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

Side by Side Diff: media/blink/texttrack_impl.h

Issue 1904253002: Convert //media/blink from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « media/blink/run_all_unittests.cc ('k') | media/blink/texttrack_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 MEDIA_BLINK_TEXTTRACK_IMPL_H_ 5 #ifndef MEDIA_BLINK_TEXTTRACK_IMPL_H_
6 #define MEDIA_BLINK_TEXTTRACK_IMPL_H_ 6 #define MEDIA_BLINK_TEXTTRACK_IMPL_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/macros.h" 11 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "media/base/text_track.h" 12 #include "media/base/text_track.h"
13 13
14 namespace base { 14 namespace base {
15 class SingleThreadTaskRunner; 15 class SingleThreadTaskRunner;
16 } 16 }
17 17
18 namespace blink { 18 namespace blink {
19 class WebInbandTextTrackClient; 19 class WebInbandTextTrackClient;
20 class WebMediaPlayerClient; 20 class WebMediaPlayerClient;
21 } 21 }
22 22
23 namespace media { 23 namespace media {
24 24
25 class WebInbandTextTrackImpl; 25 class WebInbandTextTrackImpl;
26 26
27 class TextTrackImpl : public TextTrack { 27 class TextTrackImpl : public TextTrack {
28 public: 28 public:
29 // Constructor assumes ownership of the |text_track| object. 29 // Constructor assumes ownership of the |text_track| object.
30 TextTrackImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 30 TextTrackImpl(const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
31 blink::WebMediaPlayerClient* client, 31 blink::WebMediaPlayerClient* client,
32 scoped_ptr<WebInbandTextTrackImpl> text_track); 32 std::unique_ptr<WebInbandTextTrackImpl> text_track);
33 33
34 ~TextTrackImpl() override; 34 ~TextTrackImpl() override;
35 35
36 void addWebVTTCue(const base::TimeDelta& start, 36 void addWebVTTCue(const base::TimeDelta& start,
37 const base::TimeDelta& end, 37 const base::TimeDelta& end,
38 const std::string& id, 38 const std::string& id,
39 const std::string& content, 39 const std::string& content,
40 const std::string& settings) override; 40 const std::string& settings) override;
41 41
42 private: 42 private:
43 static void OnAddCue(WebInbandTextTrackImpl* text_track, 43 static void OnAddCue(WebInbandTextTrackImpl* text_track,
44 const base::TimeDelta& start, 44 const base::TimeDelta& start,
45 const base::TimeDelta& end, 45 const base::TimeDelta& end,
46 const std::string& id, 46 const std::string& id,
47 const std::string& content, 47 const std::string& content,
48 const std::string& settings); 48 const std::string& settings);
49 49
50 static void OnRemoveTrack(blink::WebMediaPlayerClient* client, 50 static void OnRemoveTrack(blink::WebMediaPlayerClient* client,
51 scoped_ptr<WebInbandTextTrackImpl> text_track); 51 std::unique_ptr<WebInbandTextTrackImpl> text_track);
52 52
53 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 53 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
54 blink::WebMediaPlayerClient* client_; 54 blink::WebMediaPlayerClient* client_;
55 scoped_ptr<WebInbandTextTrackImpl> text_track_; 55 std::unique_ptr<WebInbandTextTrackImpl> text_track_;
56 DISALLOW_COPY_AND_ASSIGN(TextTrackImpl); 56 DISALLOW_COPY_AND_ASSIGN(TextTrackImpl);
57 }; 57 };
58 58
59 } // namespace media 59 } // namespace media
60 60
61 #endif // MEDIA_BLINK_TEXTTRACK_IMPL_H_ 61 #endif // MEDIA_BLINK_TEXTTRACK_IMPL_H_
OLDNEW
« no previous file with comments | « media/blink/run_all_unittests.cc ('k') | media/blink/texttrack_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698