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

Unified Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 1362093002: Re-land: Add localized default audio device names. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Exclude media_resource_provider on iOS. Created 5 years, 3 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 | « chrome/renderer/DEPS ('k') | content/browser/renderer_host/media/audio_output_device_enumerator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_process_observer.cc
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index fc8de3c46914f67f2552d9012436a590cbde2e15..83de1543202c301e65cf6250955cf1823bfbcf9f 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -52,6 +52,11 @@
#include "chrome/renderer/extensions/extension_localization_peer.h"
#endif
+#if !defined(OS_IOS)
+#include "chrome/common/media/media_resource_provider.h"
+#include "media/base/media_resources.h"
+#endif
+
using blink::WebCache;
using blink::WebRuntimeFeatures;
using blink::WebSecurityPolicy;
@@ -251,6 +256,10 @@ ChromeRenderProcessObserver::ChromeRenderProcessObserver()
// Configure modules that need access to resources.
net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider);
+#if !defined(OS_IOS)
+ media::SetLocalizedStringProvider(
+ chrome_common_media::LocalizedStringProvider);
+#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(USE_OPENSSL)
// On platforms where we use system NSS shared libraries,
« no previous file with comments | « chrome/renderer/DEPS ('k') | content/browser/renderer_host/media/audio_output_device_enumerator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698