| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 365b2b2b2bd007db8f5f12bd628b56e5a4a5a3b2..84e598e14e4f89885031fbe5e17572c2a6957324 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -15,6 +15,7 @@
|
| #include "chrome/browser/chrome_plugin_message_filter.h"
|
| #include "chrome/browser/chrome_quota_permission_context.h"
|
| #include "chrome/browser/chrome_worker_message_filter.h"
|
| +#include "chrome/browser/content_settings/content_settings_utils.h"
|
| #include "chrome/browser/content_settings/cookie_settings.h"
|
| #include "chrome/browser/content_settings/tab_specific_content_settings.h"
|
| #include "chrome/browser/download/download_util.h"
|
| @@ -317,10 +318,10 @@ void ChromeContentBrowserClient::BrowserRenderProcessHostCreated(
|
| profile->IsOffTheRecord()));
|
|
|
| SendExtensionWebRequestStatusToHost(host);
|
| - ContentSettingsForOneType settings;
|
| - HostContentSettingsMap* map = profile->GetHostContentSettingsMap();
|
| - map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_IMAGES, "", &settings);
|
| - host->Send(new ChromeViewMsg_SetImageSettingRules(settings));
|
| +
|
| + RendererContentSettingRules rules;
|
| + GetRendererContentSettingRules(profile->GetHostContentSettingsMap(), &rules);
|
| + host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
|
| }
|
|
|
| void ChromeContentBrowserClient::PluginProcessHostCreated(
|
|
|