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

Unified Diff: chrome/utility/extensions/extensions_handler.cc

Issue 2639503002: Convert utility process CheckMediaFile IPC to mojo (Closed)
Patch Set: Build fix: IPC::Send is now used on #ifdef WIN and OSX only. Created 3 years, 11 months 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 9992d42ec90fe10e797ef4849fae210e8b7ba3ff..8d7e7dc6f0ee22d66b6c750e2fe806a6d2f53ba9 100644
--- a/chrome/utility/extensions/extensions_handler.cc
+++ b/chrome/utility/extensions/extensions_handler.cc
@@ -45,9 +45,11 @@
namespace {
+#if defined(OS_WIN) || defined(OS_MACOSX)
bool Send(IPC::Message* message) {
return content::UtilityThread::Get()->Send(message);
}
+#endif
void ReleaseProcessIfNeeded() {
content::UtilityThread::Get()->ReleaseProcessIfNeeded();
@@ -90,6 +92,20 @@ class MediaParserImpl : public extensions::mojom::MediaParser {
ReleaseProcessIfNeeded();
}
+ void CheckMediaFile(int64_t decode_time_ms,
+ base::File file,
+ const CheckMediaFileCallback& callback) override {
+#if !defined(MEDIA_DISABLE_FFMPEG)
+ media::MediaFileChecker checker(std::move(file));
+ const bool check_success =
+ checker.Start(base::TimeDelta::FromMilliseconds(decode_time_ms));
+ callback.Run(check_success);
+#else
+ callback.Run(false);
+#endif
+ ReleaseProcessIfNeeded();
+ }
+
ChromeContentUtilityClient* const utility_client_;
DISALLOW_COPY_AND_ASSIGN(MediaParserImpl);
@@ -128,8 +144,6 @@ void ExtensionsHandler::ExposeInterfacesToBrowser(
bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(ExtensionsHandler, message)
- IPC_MESSAGE_HANDLER(ChromeUtilityMsg_CheckMediaFile, OnCheckMediaFile)
-
#if defined(OS_WIN)
IPC_MESSAGE_HANDLER(ChromeUtilityMsg_ParseITunesPrefXml,
OnParseITunesPrefXml)
@@ -155,21 +169,6 @@ bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) {
return handled || utility_handler_.OnMessageReceived(message);
}
-void ExtensionsHandler::OnCheckMediaFile(
- int64_t 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
- Send(new ChromeUtilityHostMsg_CheckMediaFile_Finished(false));
-#endif
- ReleaseProcessIfNeeded();
-}
-
#if defined(OS_WIN)
void ExtensionsHandler::OnParseITunesPrefXml(
const std::string& itunes_xml_data) {
« chrome/common/extensions/media_parser.mojom ('K') | « chrome/common/extensions/media_parser.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698