| 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 1418da01220792e054305a2d9058e06e4ed81bab..2ccdcd3dcb581bea43d2b4ba437319793857fcb4 100644
|
| --- a/chromecast/browser/cast_content_browser_client.cc
|
| +++ b/chromecast/browser/cast_content_browser_client.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chromecast/browser/cast_browser_main_parts.h"
|
| #include "chromecast/browser/cast_browser_process.h"
|
| #include "chromecast/browser/cast_network_delegate.h"
|
| +#include "chromecast/browser/cast_resource_dispatcher_host_delegate.h"
|
| #include "chromecast/browser/devtools/cast_dev_tools_delegate.h"
|
| #include "chromecast/browser/geolocation/cast_access_token_store.h"
|
| #include "chromecast/browser/media/cma_message_filter_host.h"
|
| @@ -28,6 +29,7 @@
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/certificate_request_result_type.h"
|
| #include "content/public/browser/render_process_host.h"
|
| +#include "content/public/browser/resource_dispatcher_host.h"
|
| #include "content/public/common/content_descriptors.h"
|
| #include "content/public/common/content_switches.h"
|
| #include "content/public/common/url_constants.h"
|
| @@ -160,6 +162,13 @@ void CastContentBrowserClient::OverrideWebkitPrefs(
|
| prefs->allow_running_insecure_content = true;
|
| }
|
|
|
| +void CastContentBrowserClient::ResourceDispatcherHostCreated() {
|
| + CastBrowserProcess::GetInstance()->SetResourceDispatcherHostDelegate(
|
| + make_scoped_ptr(new CastResourceDispatcherHostDelegate));
|
| + content::ResourceDispatcherHost::Get()->SetDelegate(
|
| + CastBrowserProcess::GetInstance()->resource_dispatcher_host_delegate());
|
| +}
|
| +
|
| std::string CastContentBrowserClient::GetApplicationLocale() {
|
| const std::string locale(base::i18n::GetConfiguredLocale());
|
| return locale.empty() ? "en-US" : locale;
|
|
|