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

Side by Side Diff: chrome/utility/extensions/extensions_handler.cc

Issue 1415793003: fix build when ffmpeg, libvpx and libwebm are disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch Set 2 Created 5 years, 1 month 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
OLDNEW
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "chrome/common/chrome_utility_messages.h" 9 #include "chrome/common/chrome_utility_messages.h"
10 #include "chrome/common/extensions/chrome_extensions_client.h" 10 #include "chrome/common/extensions/chrome_extensions_client.h"
11 #include "chrome/common/extensions/chrome_utility_extensions_messages.h" 11 #include "chrome/common/extensions/chrome_utility_extensions_messages.h"
12 #include "chrome/common/media_galleries/metadata_types.h" 12 #include "chrome/common/media_galleries/metadata_types.h"
13 #include "chrome/utility/chrome_content_utility_client.h" 13 #include "chrome/utility/chrome_content_utility_client.h"
14 #include "chrome/utility/media_galleries/image_metadata_extractor.h" 14 #include "chrome/utility/media_galleries/image_metadata_extractor.h"
15 #include "chrome/utility/media_galleries/ipc_data_source.h" 15 #include "chrome/utility/media_galleries/ipc_data_source.h"
16 #include "chrome/utility/media_galleries/media_metadata_parser.h" 16 #include "chrome/utility/media_galleries/media_metadata_parser.h"
17 #include "content/public/common/content_paths.h" 17 #include "content/public/common/content_paths.h"
18 #include "content/public/utility/utility_thread.h" 18 #include "content/public/utility/utility_thread.h"
19 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
20 #include "extensions/common/extension_l10n_util.h" 20 #include "extensions/common/extension_l10n_util.h"
21 #include "extensions/common/extension_utility_messages.h" 21 #include "extensions/common/extension_utility_messages.h"
22 #include "extensions/utility/unpacker.h" 22 #include "extensions/utility/unpacker.h"
23 #include "media/base/media.h" 23 #include "media/base/media.h"
24 #include "ui/base/ui_base_switches.h"
25
26 #if !defined(MEDIA_DISABLE_FFMPEG)
24 #include "media/base/media_file_checker.h" 27 #include "media/base/media_file_checker.h"
25 #include "ui/base/ui_base_switches.h" 28 #endif
26 29
27 #if defined(OS_WIN) 30 #if defined(OS_WIN)
28 #include "chrome/common/extensions/api/networking_private/networking_private_cry pto.h" 31 #include "chrome/common/extensions/api/networking_private/networking_private_cry pto.h"
29 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h" 32 #include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
30 #include "components/wifi/wifi_service.h" 33 #include "components/wifi/wifi_service.h"
31 #endif // defined(OS_WIN) 34 #endif // defined(OS_WIN)
32 35
33 #if defined(OS_MACOSX) 36 #if defined(OS_MACOSX)
34 #include "chrome/utility/media_galleries/iphoto_library_parser.h" 37 #include "chrome/utility/media_galleries/iphoto_library_parser.h"
35 #endif // defined(OS_MACOSX) 38 #endif // defined(OS_MACOSX)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 #endif // defined(OS_WIN) 116 #endif // defined(OS_WIN)
114 117
115 IPC_MESSAGE_UNHANDLED(handled = false) 118 IPC_MESSAGE_UNHANDLED(handled = false)
116 IPC_END_MESSAGE_MAP() 119 IPC_END_MESSAGE_MAP()
117 return handled || utility_handler_.OnMessageReceived(message); 120 return handled || utility_handler_.OnMessageReceived(message);
118 } 121 }
119 122
120 void ExtensionsHandler::OnCheckMediaFile( 123 void ExtensionsHandler::OnCheckMediaFile(
121 int64 milliseconds_of_decoding, 124 int64 milliseconds_of_decoding,
122 const IPC::PlatformFileForTransit& media_file) { 125 const IPC::PlatformFileForTransit& media_file) {
126 #if !defined(MEDIA_DISABLE_FFMPEG)
123 media::MediaFileChecker checker( 127 media::MediaFileChecker checker(
124 IPC::PlatformFileForTransitToFile(media_file)); 128 IPC::PlatformFileForTransitToFile(media_file));
125 const bool check_success = checker.Start( 129 const bool check_success = checker.Start(
126 base::TimeDelta::FromMilliseconds(milliseconds_of_decoding)); 130 base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
127 Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success)); 131 Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
132 #else
133 NOTREACHED();
Reilly Grant (use Gerrit) 2015/11/05 18:33:06 It seems that we should reply with failure here ra
Julien Isorce gmail 2015/11/06 10:17:47 Done in the new "Patch set 3"
134 #endif
128 ReleaseProcessIfNeeded(); 135 ReleaseProcessIfNeeded();
129 } 136 }
130 137
131 void ExtensionsHandler::OnParseMediaMetadata( 138 void ExtensionsHandler::OnParseMediaMetadata(
132 const std::string& mime_type, int64 total_size, bool get_attached_images) { 139 const std::string& mime_type, int64 total_size, bool get_attached_images) {
133 // Only one IPCDataSource may be created and added to the list of handlers. 140 // Only one IPCDataSource may be created and added to the list of handlers.
134 scoped_ptr<metadata::IPCDataSource> source( 141 scoped_ptr<metadata::IPCDataSource> source(
135 new metadata::IPCDataSource(total_size)); 142 new metadata::IPCDataSource(total_size));
136 metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser( 143 metadata::MediaMetadataParser* parser = new metadata::MediaMetadataParser(
137 source.get(), mime_type, get_attached_images); 144 source.get(), mime_type, get_attached_images);
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 221
215 std::string key_data; 222 std::string key_data;
216 std::string error; 223 std::string error;
217 wifi_service->GetKeyFromSystem(network_guid, &key_data, &error); 224 wifi_service->GetKeyFromSystem(network_guid, &key_data, &error);
218 225
219 Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty())); 226 Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty()));
220 } 227 }
221 #endif // defined(OS_WIN) 228 #endif // defined(OS_WIN)
222 229
223 } // namespace extensions 230 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698