Chromium Code Reviews| Index: chrome/common/render_messages.h |
| diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h |
| index 03ca1aa8c783cff93c2c994b94a36c920c61bd15..3842f6d2671be8a16d01ca2a38cf324f94196c3b 100644 |
| --- a/chrome/common/render_messages.h |
| +++ b/chrome/common/render_messages.h |
| @@ -19,6 +19,7 @@ |
| #include "base/values.h" |
| #include "build/build_config.h" |
| #include "chrome/common/common_param_traits.h" |
| +#include "chrome/common/content_settings.h" |
| #include "chrome/common/content_settings_pattern.h" |
| #include "chrome/common/instant_types.h" |
| #include "chrome/common/nacl_types.h" |
| @@ -168,6 +169,14 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::UsageStats) |
| IPC_STRUCT_TRAITS_MEMBER(deadSize) |
| IPC_STRUCT_TRAITS_END() |
| +IPC_STRUCT_TRAITS_BEGIN(ContentSettingPatternSource) |
|
Bernhard Bauer
2011/10/20 09:21:53
Nit: Keep these declarations is alphabetical order
marja
2011/10/20 11:44:22
Done.
|
| + IPC_STRUCT_TRAITS_MEMBER(primary_pattern) |
| + IPC_STRUCT_TRAITS_MEMBER(secondary_pattern) |
| + IPC_STRUCT_TRAITS_MEMBER(setting) |
| + IPC_STRUCT_TRAITS_MEMBER(source) |
| + IPC_STRUCT_TRAITS_MEMBER(incognito) |
| +IPC_STRUCT_TRAITS_END() |
| + |
| //----------------------------------------------------------------------------- |
| // RenderView messages |
| // These are messages sent from the browser to the renderer process. |
| @@ -235,6 +244,10 @@ 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 */) |
| + |
| // Tells the render view to load all blocked plugins. |
| IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins) |