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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/utility/extensions/extensions_handler.cc
diff --git a/chrome/utility/extensions/extensions_handler.cc b/chrome/utility/extensions/extensions_handler.cc
index 25586e9b3a2a8ca919b4e94757e2ab19337474b8..0df5559d9090828f6c08c240b1d0ee11185c50c5 100644
--- a/chrome/utility/extensions/extensions_handler.cc
+++ b/chrome/utility/extensions/extensions_handler.cc
@@ -21,9 +21,12 @@
#include "extensions/common/extension_utility_messages.h"
#include "extensions/utility/unpacker.h"
#include "media/base/media.h"
-#include "media/base/media_file_checker.h"
#include "ui/base/ui_base_switches.h"
+#if !defined(MEDIA_DISABLE_FFMPEG)
+#include "media/base/media_file_checker.h"
+#endif
+
#if defined(OS_WIN)
#include "chrome/common/extensions/api/networking_private/networking_private_crypto.h"
#include "chrome/utility/media_galleries/itunes_pref_parser_win.h"
@@ -120,11 +123,15 @@ bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
void ExtensionsHandler::OnCheckMediaFile(
int64 milliseconds_of_decoding,
const IPC::PlatformFileForTransit& media_file) {
+#if !defined(MEDIA_DISABLE_FFMPEG)
media::MediaFileChecker checker(
IPC::PlatformFileForTransitToFile(media_file));
const bool check_success = checker.Start(
base::TimeDelta::FromMilliseconds(milliseconds_of_decoding));
Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(check_success));
+#else
+ 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"
+#endif
ReleaseProcessIfNeeded();
}

Powered by Google App Engine
This is Rietveld 408576698