| Index: chrome/common/render_messages.h
|
| diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
|
| index 7c063e63272b95261f206c56fd3c0c63c9ad32da..7856d343abfcf6a0b259ebf2fdbb30daf584da05 100644
|
| --- a/chrome/common/render_messages.h
|
| +++ b/chrome/common/render_messages.h
|
| @@ -145,6 +145,11 @@ IPC_STRUCT_TRAITS_BEGIN(ContentSettingPatternSource)
|
| IPC_STRUCT_TRAITS_MEMBER(incognito)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(RendererContentSettingRules)
|
| + IPC_STRUCT_TRAITS_MEMBER(image_rules)
|
| + IPC_STRUCT_TRAITS_MEMBER(script_rules)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_TRAITS_BEGIN(ThumbnailScore)
|
| IPC_STRUCT_TRAITS_MEMBER(boring_score)
|
| IPC_STRUCT_TRAITS_MEMBER(good_clipping)
|
| @@ -242,9 +247,9 @@ IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetContentSettingsForCurrentURL,
|
| IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetDefaultContentSettings,
|
| ContentSettings /* content_settings */)
|
|
|
| -// Set the content settings for images.
|
| -IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetImageSettingRules,
|
| - ContentSettingsForOneType /* rules */)
|
| +// Set the content setting rules stored by the renderer.
|
| +IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetContentSettingRules,
|
| + RendererContentSettingRules /* rules */)
|
|
|
| // Tells the render view to load all blocked plugins.
|
| IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins)
|
|
|