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 "chrome/utility/extensions/extensions_handler.h" | 5 #include "chrome/utility/extensions/extensions_handler.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "chrome/common/extensions/chrome_extensions_client.h" | 12 #include "chrome/common/extensions/chrome_extensions_client.h" |
13 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" | 13 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" |
14 #include "chrome/common/extensions/media_parser.mojom.h" | 14 #include "chrome/common/extensions/media_parser.mojom.h" |
15 #include "chrome/common/extensions/removable_storage_writer.mojom.h" | 15 #include "chrome/common/extensions/removable_storage_writer.mojom.h" |
16 #include "chrome/common/media_galleries/metadata_types.h" | 16 #include "chrome/common/media_galleries/metadata_types.h" |
17 #include "chrome/utility/image_writer/image_writer_handler.h" | 17 #include "chrome/utility/image_writer/image_writer_handler.h" |
18 #include "chrome/utility/media_galleries/ipc_data_source.h" | 18 #include "chrome/utility/media_galleries/ipc_data_source.h" |
19 #include "chrome/utility/media_galleries/media_metadata_parser.h" | 19 #include "chrome/utility/media_galleries/media_metadata_parser.h" |
20 #include "content/public/utility/utility_thread.h" | 20 #include "content/public/utility/utility_thread.h" |
21 #include "media/base/media.h" | 21 #include "media/base/media.h" |
22 #include "mojo/public/cpp/bindings/strong_binding.h" | 22 #include "mojo/public/cpp/bindings/strong_binding.h" |
| 23 #include "services/service_manager/public/cpp/bind_source_info.h" |
23 #include "services/service_manager/public/cpp/binder_registry.h" | 24 #include "services/service_manager/public/cpp/binder_registry.h" |
24 #include "ui/base/ui_base_switches.h" | 25 #include "ui/base/ui_base_switches.h" |
25 | 26 |
26 #if !defined(MEDIA_DISABLE_FFMPEG) | 27 #if !defined(MEDIA_DISABLE_FFMPEG) |
27 #include "media/base/media_file_checker.h" | 28 #include "media/base/media_file_checker.h" |
28 #endif | 29 #endif |
29 | 30 |
30 #if defined(OS_WIN) | 31 #if defined(OS_WIN) |
31 #include "chrome/common/extensions/wifi_credentials_getter.mojom.h" | 32 #include "chrome/common/extensions/wifi_credentials_getter.mojom.h" |
32 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h" | 33 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h" |
33 #include "components/wifi/wifi_service.h" | 34 #include "components/wifi/wifi_service.h" |
34 #endif // defined(OS_WIN) | 35 #endif // defined(OS_WIN) |
35 | 36 |
36 #if defined(OS_WIN) || defined(OS_MACOSX) | 37 #if defined(OS_WIN) || defined(OS_MACOSX) |
37 #include "chrome/utility/media_galleries/iapps_xml_utils.h" | 38 #include "chrome/utility/media_galleries/iapps_xml_utils.h" |
38 #include "chrome/utility/media_galleries/itunes_library_parser.h" | 39 #include "chrome/utility/media_galleries/itunes_library_parser.h" |
39 #include "chrome/utility/media_galleries/picasa_album_table_reader.h" | 40 #include "chrome/utility/media_galleries/picasa_album_table_reader.h" |
40 #include "chrome/utility/media_galleries/picasa_albums_indexer.h" | 41 #include "chrome/utility/media_galleries/picasa_albums_indexer.h" |
41 #endif // defined(OS_WIN) || defined(OS_MACOSX) | 42 #endif // defined(OS_WIN) || defined(OS_MACOSX) |
42 | 43 |
43 namespace { | 44 namespace { |
44 | 45 |
45 class MediaParserImpl : public extensions::mojom::MediaParser { | 46 class MediaParserImpl : public extensions::mojom::MediaParser { |
46 public: | 47 public: |
47 MediaParserImpl() = default; | 48 MediaParserImpl() = default; |
48 ~MediaParserImpl() override = default; | 49 ~MediaParserImpl() override = default; |
49 | 50 |
50 static void Create(extensions::mojom::MediaParserRequest request) { | 51 static void Create(const service_manager::BindSourceInfo& source_info, |
| 52 extensions::mojom::MediaParserRequest request) { |
51 mojo::MakeStrongBinding(base::MakeUnique<MediaParserImpl>(), | 53 mojo::MakeStrongBinding(base::MakeUnique<MediaParserImpl>(), |
52 std::move(request)); | 54 std::move(request)); |
53 } | 55 } |
54 | 56 |
55 private: | 57 private: |
56 // extensions::mojom::MediaParser: | 58 // extensions::mojom::MediaParser: |
57 void ParseMediaMetadata( | 59 void ParseMediaMetadata( |
58 const std::string& mime_type, | 60 const std::string& mime_type, |
59 int64_t total_size, | 61 int64_t total_size, |
60 bool get_attached_images, | 62 bool get_attached_images, |
(...skipping 28 matching lines...) Expand all Loading... |
89 | 91 |
90 DISALLOW_COPY_AND_ASSIGN(MediaParserImpl); | 92 DISALLOW_COPY_AND_ASSIGN(MediaParserImpl); |
91 }; | 93 }; |
92 | 94 |
93 class RemovableStorageWriterImpl | 95 class RemovableStorageWriterImpl |
94 : public extensions::mojom::RemovableStorageWriter { | 96 : public extensions::mojom::RemovableStorageWriter { |
95 public: | 97 public: |
96 RemovableStorageWriterImpl() = default; | 98 RemovableStorageWriterImpl() = default; |
97 ~RemovableStorageWriterImpl() override = default; | 99 ~RemovableStorageWriterImpl() override = default; |
98 | 100 |
99 static void Create(extensions::mojom::RemovableStorageWriterRequest request) { | 101 static void Create(const service_manager::BindSourceInfo& source_info, |
| 102 extensions::mojom::RemovableStorageWriterRequest request) { |
100 mojo::MakeStrongBinding(base::MakeUnique<RemovableStorageWriterImpl>(), | 103 mojo::MakeStrongBinding(base::MakeUnique<RemovableStorageWriterImpl>(), |
101 std::move(request)); | 104 std::move(request)); |
102 } | 105 } |
103 | 106 |
104 private: | 107 private: |
105 void Write( | 108 void Write( |
106 const base::FilePath& source, | 109 const base::FilePath& source, |
107 const base::FilePath& target, | 110 const base::FilePath& target, |
108 extensions::mojom::RemovableStorageWriterClientPtr client) override { | 111 extensions::mojom::RemovableStorageWriterClientPtr client) override { |
109 writer_.Write(source, target, std::move(client)); | 112 writer_.Write(source, target, std::move(client)); |
(...skipping 11 matching lines...) Expand all Loading... |
121 DISALLOW_COPY_AND_ASSIGN(RemovableStorageWriterImpl); | 124 DISALLOW_COPY_AND_ASSIGN(RemovableStorageWriterImpl); |
122 }; | 125 }; |
123 | 126 |
124 #if defined(OS_WIN) | 127 #if defined(OS_WIN) |
125 class WiFiCredentialsGetterImpl | 128 class WiFiCredentialsGetterImpl |
126 : public extensions::mojom::WiFiCredentialsGetter { | 129 : public extensions::mojom::WiFiCredentialsGetter { |
127 public: | 130 public: |
128 WiFiCredentialsGetterImpl() = default; | 131 WiFiCredentialsGetterImpl() = default; |
129 ~WiFiCredentialsGetterImpl() override = default; | 132 ~WiFiCredentialsGetterImpl() override = default; |
130 | 133 |
131 static void Create(extensions::mojom::WiFiCredentialsGetterRequest request) { | 134 static void Create(const service_manager::BindSourceInfo& source_info, |
| 135 extensions::mojom::WiFiCredentialsGetterRequest request) { |
132 mojo::MakeStrongBinding(base::MakeUnique<WiFiCredentialsGetterImpl>(), | 136 mojo::MakeStrongBinding(base::MakeUnique<WiFiCredentialsGetterImpl>(), |
133 std::move(request)); | 137 std::move(request)); |
134 } | 138 } |
135 | 139 |
136 private: | 140 private: |
137 // extensions::mojom::WiFiCredentialsGetter: | 141 // extensions::mojom::WiFiCredentialsGetter: |
138 void GetWiFiCredentials(const std::string& ssid, | 142 void GetWiFiCredentials(const std::string& ssid, |
139 const GetWiFiCredentialsCallback& callback) override { | 143 const GetWiFiCredentialsCallback& callback) override { |
140 if (ssid == kWiFiTestNetwork) { | 144 if (ssid == kWiFiTestNetwork) { |
141 callback.Run(true, ssid); // test-mode: return the ssid in key_data. | 145 callback.Run(true, ssid); // test-mode: return the ssid in key_data. |
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
277 picasa::PicasaAlbumsIndexer indexer(album_uids); | 281 picasa::PicasaAlbumsIndexer indexer(album_uids); |
278 indexer.ParseFolderINI(folders_inis); | 282 indexer.ParseFolderINI(folders_inis); |
279 content::UtilityThread::Get()->Send( | 283 content::UtilityThread::Get()->Send( |
280 new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished( | 284 new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished( |
281 indexer.albums_images())); | 285 indexer.albums_images())); |
282 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); | 286 content::UtilityThread::Get()->ReleaseProcessIfNeeded(); |
283 } | 287 } |
284 #endif // defined(OS_WIN) || defined(OS_MACOSX) | 288 #endif // defined(OS_WIN) || defined(OS_MACOSX) |
285 | 289 |
286 } // namespace extensions | 290 } // namespace extensions |
OLD | NEW |