| Index: chrome/common/render_messages.h
|
| diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
|
| index 7e09b6e5850b7cace20cfca8af3d54bb683871e2..9d5e71e24e4c75f44623ea45ab93ea4a6099ba2c 100644
|
| --- a/chrome/common/render_messages.h
|
| +++ b/chrome/common/render_messages.h
|
| @@ -19,6 +19,8 @@
|
| #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"
|
| #include "chrome/common/search_provider.h"
|
| @@ -149,6 +151,29 @@ IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::UsageStats)
|
| IPC_STRUCT_TRAITS_MEMBER(deadSize)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(ContentSettingsPattern::PatternParts)
|
| + IPC_STRUCT_TRAITS_MEMBER(scheme)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_scheme_wildcard)
|
| + IPC_STRUCT_TRAITS_MEMBER(host)
|
| + IPC_STRUCT_TRAITS_MEMBER(has_domain_wildcard)
|
| + IPC_STRUCT_TRAITS_MEMBER(port)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_port_wildcard)
|
| + IPC_STRUCT_TRAITS_MEMBER(path)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_TRAITS_BEGIN(ContentSettingsPattern)
|
| + IPC_STRUCT_TRAITS_MEMBER(parts_)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_valid_)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| +IPC_STRUCT_TRAITS_BEGIN(ContentSettingPatternSource)
|
| + 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.
|
| @@ -216,6 +241,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)
|
|
|
|
|