OLD | NEW |
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 CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ | 5 #ifndef CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ |
6 #define CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ | 6 #define CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ |
7 | 7 |
| 8 #include <memory> |
8 #include <string> | 9 #include <string> |
9 #include <vector> | 10 #include <vector> |
10 | 11 |
11 #include "base/callback.h" | 12 #include "base/callback.h" |
12 #include "base/macros.h" | 13 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | |
14 #include "chrome/common/extensions/api/media_galleries.h" | 14 #include "chrome/common/extensions/api/media_galleries.h" |
15 #include "chrome/common/media_galleries/metadata_types.h" | 15 #include "chrome/common/media_galleries/metadata_types.h" |
16 | 16 |
17 namespace base { | 17 namespace base { |
18 class Thread; | 18 class Thread; |
19 } | 19 } |
20 | 20 |
21 namespace media { | 21 namespace media { |
22 class DataSource; | 22 class DataSource; |
23 } | 23 } |
(...skipping 27 matching lines...) Expand all Loading... |
51 media::DataSource* const source_; | 51 media::DataSource* const source_; |
52 | 52 |
53 const std::string mime_type_; | 53 const std::string mime_type_; |
54 | 54 |
55 bool get_attached_images_; | 55 bool get_attached_images_; |
56 | 56 |
57 // Thread that blocking media parsing operations run on while the main thread | 57 // Thread that blocking media parsing operations run on while the main thread |
58 // handles messages from the browser process. | 58 // handles messages from the browser process. |
59 // TODO(tommycli): Replace with a reference to a WorkerPool if we ever use | 59 // TODO(tommycli): Replace with a reference to a WorkerPool if we ever use |
60 // this class in batch mode. | 60 // this class in batch mode. |
61 scoped_ptr<base::Thread> media_thread_; | 61 std::unique_ptr<base::Thread> media_thread_; |
62 | 62 |
63 DISALLOW_COPY_AND_ASSIGN(MediaMetadataParser); | 63 DISALLOW_COPY_AND_ASSIGN(MediaMetadataParser); |
64 }; | 64 }; |
65 | 65 |
66 } // namespace metadata | 66 } // namespace metadata |
67 | 67 |
68 #endif // CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ | 68 #endif // CHROME_UTILITY_MEDIA_GALLERIES_MEDIA_METADATA_PARSER_H_ |
OLD | NEW |