Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index bc66fe7f734444397796034356f37a86ad3a5171..516f3b7af6d096f8ae267138821831332ae35854 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -101,6 +101,7 @@ |
#include "chrome/common/crash_keys.h" |
#include "chrome/common/env_vars.h" |
#include "chrome/common/logging_chrome.h" |
+#include "chrome/common/media/media_resource_provider.h" |
#include "chrome/common/net/net_resource_provider.h" |
#include "chrome/common/pref_names.h" |
#include "chrome/common/profiling.h" |
@@ -140,6 +141,7 @@ |
#include "content/public/common/main_function_params.h" |
#include "grit/platform_locale_settings.h" |
#include "media/audio/audio_manager.h" |
+#include "media/base/media_resources.h" |
#include "net/base/net_module.h" |
#include "net/cookies/cookie_monster.h" |
#include "net/http/http_network_layer.h" |
@@ -1526,6 +1528,8 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() { |
// Configure modules that need access to resources. |
net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
+ media::SetLocalizedStringProvider( |
+ base::Bind(&chrome_common_media::LocalizedStringProvider)); |
Nico
2015/09/18 00:48:23
NetResourceProvider doesn't use Bind() – can this
DaleCurtis
2015/09/18 01:00:54
Heh, I recommended he use bind instead, but now we
|
// In unittest mode, this will do nothing. In normal mode, this will create |
// the global IntranetRedirectDetector instance, which will promptly go to |