OLD | NEW |
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 #include "components/html_viewer/media_factory.h" | 5 #include "components/html_viewer/media_factory.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; | 162 // TODO(dalecurtis): Replace this with an interface to an actual mojo service; |
163 // the AudioOutputStreamSink will not work in sandboxed processes. | 163 // the AudioOutputStreamSink will not work in sandboxed processes. |
164 return new media::AudioOutputStreamSink(); | 164 return new media::AudioOutputStreamSink(); |
165 } | 165 } |
166 | 166 |
167 scoped_refptr<base::SingleThreadTaskRunner> | 167 scoped_refptr<base::SingleThreadTaskRunner> |
168 MediaFactory::GetMediaThreadTaskRunner() { | 168 MediaFactory::GetMediaThreadTaskRunner() { |
169 if (!media_thread_.IsRunning()) | 169 if (!media_thread_.IsRunning()) |
170 media_thread_.Start(); | 170 media_thread_.Start(); |
171 | 171 |
172 return media_thread_.message_loop_proxy(); | 172 return media_thread_.task_runner(); |
173 } | 173 } |
174 #endif // !defined(OS_ANDROID) | 174 #endif // !defined(OS_ANDROID) |
175 | 175 |
176 } // namespace html_viewer | 176 } // namespace html_viewer |
OLD | NEW |