chrome/browser/chrome_browser_main_android.cc - Issue 1427183002: Move MediaDrmBridge provision communication to native side.

Unified Diff: chrome/browser/chrome_browser_main_android.cc

Issue 1427183002: Move MediaDrmBridge provision communication to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« no previous file with comments | « no previous file | chrome/browser/media/android/provision/url_provision_fetcher.h » ('j') | chrome/browser/media/android/provision/url_provision_fetcher.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main_android.cc

diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc

index 4fd6d9d710200af8f35ce61a540c1c81723864ef..a78ac71d090fdae54371f547b79f5ba8f6efa483 100644

--- a/chrome/browser/chrome_browser_main_android.cc

+++ b/chrome/browser/chrome_browser_main_android.cc

@@ -13,6 +13,7 @@

#include "base/trace_event/trace_event.h"

#include "chrome/browser/android/chrome_media_client_android.h"

#include "chrome/browser/android/seccomp_support_detector.h"

+#include "chrome/browser/media/android/provision/url_provision_fetcher.h"

#include "chrome/browser/signin/signin_manager_factory.h"

#include "chrome/common/chrome_paths.h"

#include "components/crash/content/app/breakpad_linux.h"

@@ -23,6 +24,7 @@

#include "content/public/browser/browser_thread.h"

#include "content/public/common/main_function_params.h"

#include "media/base/android/media_client_android.h"

+#include "media/base/android/provision_fetcher.h"

#include "net/android/network_change_notifier_factory_android.h"

#include "net/base/network_change_notifier.h"

#include "ui/base/resource/resource_bundle_android.h"

@@ -124,6 +126,7 @@ void ChromeBrowserMainPartsAndroid::PreEarlyInitialization() {

}

void ChromeBrowserMainPartsAndroid::PreMainMessageLoopRun() {

+ media::ProvisionFetcher::SetFactory(new media::URLProvisionFetcherFactory);

media::SetMediaClientAndroid(new ChromeMediaClientAndroid);

xhwang 2015/11/02 20:37:04 Wondering whether we can merge these two by puttin

Tima Vaisburd 2015/11/05 02:24:06 MediaClientAndroid now has the method CreateDefaul

ChromeBrowserMainParts::PreMainMessageLoopRun();