OLD | NEW |
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_content_browser_client.h" | 5 #include "chromecast/browser/cast_content_browser_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 CastContentBrowserClient::~CastContentBrowserClient() { | 59 CastContentBrowserClient::~CastContentBrowserClient() { |
60 content::BrowserThread::DeleteSoon( | 60 content::BrowserThread::DeleteSoon( |
61 content::BrowserThread::IO, | 61 content::BrowserThread::IO, |
62 FROM_HERE, | 62 FROM_HERE, |
63 url_request_context_factory_.release()); | 63 url_request_context_factory_.release()); |
64 } | 64 } |
65 | 65 |
66 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts( | 66 content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts( |
67 const content::MainFunctionParams& parameters) { | 67 const content::MainFunctionParams& parameters) { |
68 return new CastBrowserMainParts(parameters, | 68 return new CastBrowserMainParts(parameters, |
69 url_request_context_factory_.get()); | 69 url_request_context_factory_.get(), |
| 70 PlatformGetAudioManagerFactory()); |
70 } | 71 } |
71 | 72 |
72 void CastContentBrowserClient::RenderProcessWillLaunch( | 73 void CastContentBrowserClient::RenderProcessWillLaunch( |
73 content::RenderProcessHost* host) { | 74 content::RenderProcessHost* host) { |
74 #if !defined(OS_ANDROID) | 75 #if !defined(OS_ANDROID) |
75 scoped_refptr<media::CmaMessageFilterHost> cma_message_filter( | 76 scoped_refptr<media::CmaMessageFilterHost> cma_message_filter( |
76 new media::CmaMessageFilterHost(host->GetID())); | 77 new media::CmaMessageFilterHost(host->GetID())); |
77 host->AddFilter(cma_message_filter.get()); | 78 host->AddFilter(cma_message_filter.get()); |
78 #endif // !defined(OS_ANDROID) | 79 #endif // !defined(OS_ANDROID) |
79 | 80 |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
411 process_type, dumps_path, false /* upload */); | 412 process_type, dumps_path, false /* upload */); |
412 // StartUploaderThread() even though upload is diferred. | 413 // StartUploaderThread() even though upload is diferred. |
413 // Breakpad-related memory is freed in the uploader thread. | 414 // Breakpad-related memory is freed in the uploader thread. |
414 crash_handler->StartUploaderThread(); | 415 crash_handler->StartUploaderThread(); |
415 return crash_handler; | 416 return crash_handler; |
416 } | 417 } |
417 #endif // !defined(OS_ANDROID) | 418 #endif // !defined(OS_ANDROID) |
418 | 419 |
419 } // namespace shell | 420 } // namespace shell |
420 } // namespace chromecast | 421 } // namespace chromecast |
OLD | NEW |