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

Side by Side Diff: media/filters/decoder_base.h

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/filters/ffmpeg_demuxer_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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // A base class that provides the plumbing for a decoder filters. 5 // A base class that provides the plumbing for a decoder filters.
6 6
7 #ifndef MEDIA_FILTERS_DECODER_BASE_H_ 7 #ifndef MEDIA_FILTERS_DECODER_BASE_H_
8 #define MEDIA_FILTERS_DECODER_BASE_H_ 8 #define MEDIA_FILTERS_DECODER_BASE_H_
9 9
10 #include <deque> 10 #include <deque>
11 11
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/stl_util-inl.h" 13 #include "base/stl_util-inl.h"
14 #include "base/task.h" 14 #include "base/task.h"
15 #include "base/thread.h" 15 #include "base/threading/thread.h"
16 #include "media/base/buffers.h" 16 #include "media/base/buffers.h"
17 #include "media/base/callback.h" 17 #include "media/base/callback.h"
18 #include "media/base/filters.h" 18 #include "media/base/filters.h"
19 #include "media/base/filter_host.h" 19 #include "media/base/filter_host.h"
20 20
21 namespace media { 21 namespace media {
22 22
23 // In this class, we over-specify method lookup via this-> to avoid unexpected 23 // In this class, we over-specify method lookup via this-> to avoid unexpected
24 // name resolution issues due to the two-phase lookup needed for dependent 24 // name resolution issues due to the two-phase lookup needed for dependent
25 // name resolution in templates. 25 // name resolution in templates.
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 kStopped, 301 kStopped,
302 }; 302 };
303 State state_; 303 State state_;
304 304
305 DISALLOW_COPY_AND_ASSIGN(DecoderBase); 305 DISALLOW_COPY_AND_ASSIGN(DecoderBase);
306 }; 306 };
307 307
308 } // namespace media 308 } // namespace media
309 309
310 #endif // MEDIA_FILTERS_DECODER_BASE_H_ 310 #endif // MEDIA_FILTERS_DECODER_BASE_H_
OLDNEW
« no previous file with comments | « media/base/pipeline_impl.h ('k') | media/filters/ffmpeg_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698