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

Unified Diff: chromecast/browser/cast_content_browser_client.cc

Issue 1171303002: Chromecast: move link-time decisions to inheritance-based Content*Client. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 5 years, 6 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
Index: chromecast/browser/cast_content_browser_client.cc
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index 9e265aebb915d873480ece897e267c6978a49848..482ddaa6fc5aa164317f5e1a4d45213ca561d2b4 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -65,11 +65,35 @@ CastContentBrowserClient::~CastContentBrowserClient() {
url_request_context_factory_.release());
}
+void CastContentBrowserClient::AppendExtraCommandLineSwitches(
+ base::CommandLine* command_line) {
+}
+
+std::vector<scoped_refptr<content::BrowserMessageFilter>>
+CastContentBrowserClient::GetBrowserMessageFilters() {
+ return std::vector<scoped_refptr<content::BrowserMessageFilter>>();
+}
+
+scoped_ptr<::media::AudioManagerFactory>
+CastContentBrowserClient::CreateAudioManagerFactory() {
+ // Return nullptr. The factory will not be set, and the statically linked
+ // implementation of AudioManager will be used.
+ return scoped_ptr<::media::AudioManagerFactory>();
+}
+
+#if !defined(OS_ANDROID)
+scoped_ptr<media::MediaPipelineDevice>
+CastContentBrowserClient::CreateMediaPipelineDevice(
+ const media::MediaPipelineDeviceParams& params) {
+ return media::CreateMediaPipelineDevice(params);
+}
+#endif
+
content::BrowserMainParts* CastContentBrowserClient::CreateBrowserMainParts(
const content::MainFunctionParams& parameters) {
return new CastBrowserMainParts(parameters,
url_request_context_factory_.get(),
- PlatformCreateAudioManagerFactory());
+ CreateAudioManagerFactory());
}
void CastContentBrowserClient::RenderProcessWillLaunch(
@@ -79,7 +103,7 @@ void CastContentBrowserClient::RenderProcessWillLaunch(
new media::CmaMessageFilterHost(
host->GetID(),
base::Bind(
- &CastContentBrowserClient::PlatformCreateMediaPipelineDevice,
+ &CastContentBrowserClient::CreateMediaPipelineDevice,
base::Unretained(this))));
host->AddFilter(cma_message_filter.get());
#endif // !defined(OS_ANDROID)
@@ -94,7 +118,7 @@ void CastContentBrowserClient::RenderProcessWillLaunch(
base::Bind(&CastContentBrowserClient::AddNetworkHintsMessageFilter,
base::Unretained(this), host->GetID()));
- auto extra_filters = PlatformGetBrowserMessageFilters();
+ auto extra_filters = GetBrowserMessageFilters();
for (auto const& filter : extra_filters) {
host->AddFilter(filter.get());
}
@@ -199,7 +223,7 @@ void CastContentBrowserClient::AppendExtraCommandLineSwitches(
}
#endif
- PlatformAppendExtraCommandLineSwitches(command_line);
+ AppendExtraCommandLineSwitches(command_line);
}
content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() {

Powered by Google App Engine
This is Rietveld 408576698