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

Side by Side Diff: media/filters/file_data_source.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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 | « chrome_frame/utils.cc ('k') | media/filters/file_data_source_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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #include <limits> 5 #include <limits>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/string_util.h" 8 #include "base/utf_string_conversions.h"
9 #include "media/base/filter_host.h" 9 #include "media/base/filter_host.h"
10 #include "media/base/filters.h" 10 #include "media/base/filters.h"
11 #include "media/base/pipeline.h" 11 #include "media/base/pipeline.h"
12 #include "media/filters/file_data_source.h" 12 #include "media/filters/file_data_source.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 FileDataSource::FileDataSource() 16 FileDataSource::FileDataSource()
17 : file_(NULL), 17 : file_(NULL),
18 file_size_(0) { 18 file_size_(0) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 AutoLock l(lock_); 99 AutoLock l(lock_);
100 *size_out = file_size_; 100 *size_out = file_size_;
101 return (NULL != file_); 101 return (NULL != file_);
102 } 102 }
103 103
104 bool FileDataSource::IsStreaming() { 104 bool FileDataSource::IsStreaming() {
105 return false; 105 return false;
106 } 106 }
107 107
108 } // namespace media 108 } // namespace media
OLDNEW
« no previous file with comments | « chrome_frame/utils.cc ('k') | media/filters/file_data_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698