| Index: chromecast/browser/cast_content_browser_client.h
|
| diff --git a/chromecast/browser/cast_content_browser_client.h b/chromecast/browser/cast_content_browser_client.h
|
| index de03fb254f5f21b79eb7e38f6f247105405beb22..9d16a0a190c80332d096184261fd5c9cf0be9a5f 100644
|
| --- a/chromecast/browser/cast_content_browser_client.h
|
| +++ b/chromecast/browser/cast_content_browser_client.h
|
| @@ -32,9 +32,8 @@ namespace chromecast {
|
| class CastService;
|
|
|
| namespace media {
|
| -class MediaPipelineBackend;
|
| -struct MediaPipelineDeviceParams;
|
| class CmaMediaPipelineClient;
|
| +class VideoPlaneController;
|
| }
|
|
|
| namespace shell {
|
| @@ -62,7 +61,8 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| virtual scoped_ptr<CastService> CreateCastService(
|
| content::BrowserContext* browser_context,
|
| PrefService* pref_service,
|
| - net::URLRequestContextGetter* request_context_getter);
|
| + net::URLRequestContextGetter* request_context_getter,
|
| + media::VideoPlaneController* video_plane_controller);
|
|
|
| #if !defined(OS_ANDROID)
|
| // Returns CmaMediaPipelineClient which is responsible to create
|
| @@ -70,9 +70,6 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| scoped_refptr<media::CmaMediaPipelineClient> GetCmaMediaPipelineClient();
|
| #endif
|
|
|
| - // Performs cleanup for process exit (but before AtExitManager cleanup).
|
| - void ProcessExiting();
|
| -
|
| // Invoked when the metrics client ID changes.
|
| virtual void SetMetricsClientId(const std::string& client_id);
|
|
|
| @@ -160,8 +157,6 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| CastContentBrowserClient();
|
|
|
| // Returns the task runner that must be used for media IO.
|
| - // TODO(alokp): We might need to make it public as we convert more callsites
|
| - // using MediaMessageLoop directly.
|
| scoped_refptr<base::SingleThreadTaskRunner> GetMediaTaskRunner();
|
|
|
| #if !defined(OS_ANDROID)
|
| @@ -196,6 +191,8 @@ class CastContentBrowserClient : public content::ContentBrowserClient {
|
| scoped_refptr<media::CmaMediaPipelineClient> cma_media_pipeline_client_;
|
| #endif // !defined(OS_ANDROID)
|
|
|
| + // Created by CastContentBrowserClient but owned by BrowserMainLoop.
|
| + CastBrowserMainParts* cast_browser_main_parts_;
|
| scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
|
|
|