github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3957 from atom/widevine

Browse Source 
Merge #3830
This commit is contained in:
Cheng Zhao
2015-12-30 12:46:19 +08:00
parent 82a293a132 c5238bb8f0
commit cb5d79e0df
19 changed files with 481 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
atom/browser/atom_browser_client.cc
View File

@@ -25,6 +25,7 @@
#include "base/strings/string_number_conversions.h"
#include "chrome/browser/printing/printing_message_filter.h"
#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
#include "chrome/browser/renderer_host/pepper/widevine_cdm_message_filter.h"
#include "chrome/browser/speech/tts_message_filter.h"
#include "content/public/browser/browser_ppapi_host.h"
#include "content/public/browser/client_certificate_delegate.h"
@@ -105,6 +106,8 @@ void AtomBrowserClient::RenderProcessWillLaunch(
int process_id = host->GetID();
host->AddFilter(new printing::PrintingMessageFilter(process_id));
host->AddFilter(new TtsMessageFilter(process_id, host->GetBrowserContext()));
host->AddFilter(
new WidevineCdmMessageFilter(process_id, host->GetBrowserContext()));
}
content::SpeechRecognitionManagerDelegate*