media/base/text_track.h - Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/text_track.h

Issue 1906423005: Replace scoped_ptr with std::unique_ptr in //media/base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: scopedptr-media-base: . 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 side-by-side diff with in-line comments

Download patch

Index: media/base/text_track.h

diff --git a/media/base/text_track.h b/media/base/text_track.h

index 0e04a0eb46dab94db2290c73df6cf4b3f6293492..97dbd75267f44fd30c6e6ca4165bb619f3c83c91 100644

--- a/media/base/text_track.h

+++ b/media/base/text_track.h

@@ -5,10 +5,10 @@

#ifndef MEDIA_BASE_TEXT_TRACK_H_

#define MEDIA_BASE_TEXT_TRACK_H_

+#include <memory>

#include <string>

#include "base/callback.h"

-#include "base/memory/scoped_ptr.h"

#include "base/time/time.h"

namespace media {

@@ -25,8 +25,7 @@ class TextTrack {

const std::string& settings) = 0;

};

-typedef base::Callback<void

- (scoped_ptr<TextTrack>)> AddTextTrackDoneCB;

+typedef base::Callback<void(std::unique_ptr<TextTrack>)> AddTextTrackDoneCB;

dcheng 2016/04/23 00:57:23 using, possibly

danakj 2016/04/23 01:11:15 Done.

typedef base::Callback<void

(const TextTrackConfig& config,

« media/base/stream_parser.h ('K') | « media/base/text_renderer_unittest.cc ('k') | media/base/user_input_monitor.h » ('j') | media/base/video_frame.h » ('J')