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

Side by Side Diff: chromecast/browser/cast_browser_main_parts.cc

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up code, implement actual Delegates for Widevine (Android) and Chromecast Created 5 years, 8 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 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 "chromecast/browser/cast_browser_main_parts.h" 5 #include "chromecast/browser/cast_browser_main_parts.h"
6 6
7 #if !defined(OS_ANDROID) 7 #if !defined(OS_ANDROID)
8 #include <signal.h> 8 #include <signal.h>
9 #include <sys/prctl.h> 9 #include <sys/prctl.h>
10 #endif 10 #endif
(...skipping 19 matching lines...) Expand all
30 #include "chromecast/common/chromecast_switches.h" 30 #include "chromecast/common/chromecast_switches.h"
31 #include "chromecast/common/platform_client_auth.h" 31 #include "chromecast/common/platform_client_auth.h"
32 #include "chromecast/net/connectivity_checker.h" 32 #include "chromecast/net/connectivity_checker.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "content/public/common/content_switches.h" 34 #include "content/public/common/content_switches.h"
35 #include "media/base/browser_cdm_factory.h" 35 #include "media/base/browser_cdm_factory.h"
36 #include "media/base/media_switches.h" 36 #include "media/base/media_switches.h"
37 37
38 #if defined(OS_ANDROID) 38 #if defined(OS_ANDROID)
39 #include "chromecast/crash/android/crash_handler.h" 39 #include "chromecast/crash/android/crash_handler.h"
40 #include "chromecast/media/cdm/playready_drm_delegate_android.h"
41 #include "components/cdm/browser/widevine_drm_delegate_android.h"
40 #include "components/crash/browser/crash_dump_manager_android.h" 42 #include "components/crash/browser/crash_dump_manager_android.h"
41 #include "net/android/network_change_notifier_factory_android.h" 43 #include "net/android/network_change_notifier_factory_android.h"
42 #else 44 #else
43 #include "chromecast/browser/media/cast_browser_cdm_factory.h" 45 #include "chromecast/browser/media/cast_browser_cdm_factory.h"
44 #endif 46 #endif
45 47
46 #if defined(USE_AURA) 48 #if defined(USE_AURA)
47 #include "ui/aura/test/test_screen.h" 49 #include "ui/aura/test/test_screen.h"
48 #include "ui/gfx/screen.h" 50 #include "ui/gfx/screen.h"
49 #endif 51 #endif
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 #endif 256 #endif
255 return 0; 257 return 0;
256 } 258 }
257 259
258 void CastBrowserMainParts::PreMainMessageLoopRun() { 260 void CastBrowserMainParts::PreMainMessageLoopRun() {
259 scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple()); 261 scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple());
260 metrics::RegisterPrefs(pref_registry.get()); 262 metrics::RegisterPrefs(pref_registry.get());
261 cast_browser_process_->SetPrefService( 263 cast_browser_process_->SetPrefService(
262 PrefServiceHelper::CreatePrefService(pref_registry.get())); 264 PrefServiceHelper::CreatePrefService(pref_registry.get()));
263 265
264 #if !defined(OS_ANDROID) 266 #if defined(OS_ANDROID)
267 #if defined(PLAYREADY_CDM_AVAILABLE)
268 media::PlayreadyDrmDelegateAndroid::Install();
269 #endif
270 cdm::WidevineDrmDelegateAndroid::Install();
271 #else
265 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 272 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
266 if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) 273 if (cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
267 ::media::SetBrowserCdmFactory(new media::CastBrowserCdmFactory); 274 ::media::SetBrowserCdmFactory(new media::CastBrowserCdmFactory);
268 #endif // !defined(OS_ANDROID) 275 #endif // !defined(OS_ANDROID)
269 276
270 cast_browser_process_->SetConnectivityChecker( 277 cast_browser_process_->SetConnectivityChecker(
271 make_scoped_refptr(new ConnectivityChecker( 278 make_scoped_refptr(new ConnectivityChecker(
272 content::BrowserThread::GetMessageLoopProxyForThread( 279 content::BrowserThread::GetMessageLoopProxyForThread(
273 content::BrowserThread::FILE)))); 280 content::BrowserThread::FILE))));
274 281
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 #else 349 #else
343 cast_browser_process_->cast_service()->Finalize(); 350 cast_browser_process_->cast_service()->Finalize();
344 cast_browser_process_->metrics_service_client()->Finalize(); 351 cast_browser_process_->metrics_service_client()->Finalize();
345 cast_browser_process_.reset(); 352 cast_browser_process_.reset();
346 DeregisterKillOnAlarm(); 353 DeregisterKillOnAlarm();
347 #endif 354 #endif
348 } 355 }
349 356
350 } // namespace shell 357 } // namespace shell
351 } // namespace chromecast 358 } // namespace chromecast
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698