OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 // Multiply-included file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
6 #include <map> | 6 #include <map> |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 // TODO(erg): This list has been temporarily annotated by erg while doing work | 11 // TODO(erg): This list has been temporarily annotated by erg while doing work |
12 // on which headers to pull out. | 12 // on which headers to pull out. |
13 #include "base/basictypes.h" | 13 #include "base/basictypes.h" |
14 #include "base/file_path.h" | 14 #include "base/file_path.h" |
15 #include "base/process.h" | 15 #include "base/process.h" |
16 #include "base/shared_memory.h" | 16 #include "base/shared_memory.h" |
17 #include "base/string16.h" | 17 #include "base/string16.h" |
18 #include "base/stringprintf.h" | 18 #include "base/stringprintf.h" |
19 #include "base/values.h" | 19 #include "base/values.h" |
20 #include "build/build_config.h" | 20 #include "build/build_config.h" |
21 #include "chrome/common/common_param_traits.h" | 21 #include "chrome/common/common_param_traits.h" |
22 #include "chrome/common/content_settings.h" | |
22 #include "chrome/common/content_settings_pattern.h" | 23 #include "chrome/common/content_settings_pattern.h" |
23 #include "chrome/common/instant_types.h" | 24 #include "chrome/common/instant_types.h" |
24 #include "chrome/common/nacl_types.h" | 25 #include "chrome/common/nacl_types.h" |
25 #include "chrome/common/search_provider.h" | 26 #include "chrome/common/search_provider.h" |
26 #include "chrome/common/thumbnail_score.h" | 27 #include "chrome/common/thumbnail_score.h" |
27 #include "chrome/common/translate_errors.h" | 28 #include "chrome/common/translate_errors.h" |
28 #include "content/common/common_param_traits.h" | 29 #include "content/common/common_param_traits.h" |
29 #include "content/common/webkit_param_traits.h" | 30 #include "content/common/webkit_param_traits.h" |
30 #include "ipc/ipc_message_macros.h" | 31 #include "ipc/ipc_message_macros.h" |
31 #include "ipc/ipc_platform_file.h" | 32 #include "ipc/ipc_platform_file.h" |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 IPC_STRUCT_TRAITS_END() | 162 IPC_STRUCT_TRAITS_END() |
162 | 163 |
163 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::UsageStats) | 164 IPC_STRUCT_TRAITS_BEGIN(WebKit::WebCache::UsageStats) |
164 IPC_STRUCT_TRAITS_MEMBER(minDeadCapacity) | 165 IPC_STRUCT_TRAITS_MEMBER(minDeadCapacity) |
165 IPC_STRUCT_TRAITS_MEMBER(maxDeadCapacity) | 166 IPC_STRUCT_TRAITS_MEMBER(maxDeadCapacity) |
166 IPC_STRUCT_TRAITS_MEMBER(capacity) | 167 IPC_STRUCT_TRAITS_MEMBER(capacity) |
167 IPC_STRUCT_TRAITS_MEMBER(liveSize) | 168 IPC_STRUCT_TRAITS_MEMBER(liveSize) |
168 IPC_STRUCT_TRAITS_MEMBER(deadSize) | 169 IPC_STRUCT_TRAITS_MEMBER(deadSize) |
169 IPC_STRUCT_TRAITS_END() | 170 IPC_STRUCT_TRAITS_END() |
170 | 171 |
172 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.
| |
173 IPC_STRUCT_TRAITS_MEMBER(primary_pattern) | |
174 IPC_STRUCT_TRAITS_MEMBER(secondary_pattern) | |
175 IPC_STRUCT_TRAITS_MEMBER(setting) | |
176 IPC_STRUCT_TRAITS_MEMBER(source) | |
177 IPC_STRUCT_TRAITS_MEMBER(incognito) | |
178 IPC_STRUCT_TRAITS_END() | |
179 | |
171 //----------------------------------------------------------------------------- | 180 //----------------------------------------------------------------------------- |
172 // RenderView messages | 181 // RenderView messages |
173 // These are messages sent from the browser to the renderer process. | 182 // These are messages sent from the browser to the renderer process. |
174 | 183 |
175 // Tells the renderer to set its maximum cache size to the supplied value. | 184 // Tells the renderer to set its maximum cache size to the supplied value. |
176 IPC_MESSAGE_CONTROL3(ChromeViewMsg_SetCacheCapacities, | 185 IPC_MESSAGE_CONTROL3(ChromeViewMsg_SetCacheCapacities, |
177 size_t /* min_dead_capacity */, | 186 size_t /* min_dead_capacity */, |
178 size_t /* max_dead_capacity */, | 187 size_t /* max_dead_capacity */, |
179 size_t /* capacity */) | 188 size_t /* capacity */) |
180 | 189 |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
228 IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetContentSettingsForCurrentURL, | 237 IPC_MESSAGE_CONTROL2(ChromeViewMsg_SetContentSettingsForCurrentURL, |
229 GURL /* url */, | 238 GURL /* url */, |
230 ContentSettings /* content_settings */) | 239 ContentSettings /* content_settings */) |
231 | 240 |
232 // Set the content settings for a particular url that the renderer is in the | 241 // Set the content settings for a particular url that the renderer is in the |
233 // process of loading. This will be stored, to be used if the load commits | 242 // process of loading. This will be stored, to be used if the load commits |
234 // and ignored otherwise. | 243 // and ignored otherwise. |
235 IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetDefaultContentSettings, | 244 IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetDefaultContentSettings, |
236 ContentSettings /* content_settings */) | 245 ContentSettings /* content_settings */) |
237 | 246 |
247 // Set the content settings for images. | |
248 IPC_MESSAGE_CONTROL1(ChromeViewMsg_SetImageSettingRules, | |
249 ContentSettingsForOneType /* rules */) | |
250 | |
238 // Tells the render view to load all blocked plugins. | 251 // Tells the render view to load all blocked plugins. |
239 IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins) | 252 IPC_MESSAGE_ROUTED0(ChromeViewMsg_LoadBlockedPlugins) |
240 | 253 |
241 // Asks the renderer to send back stats on the WebCore cache broken down by | 254 // Asks the renderer to send back stats on the WebCore cache broken down by |
242 // resource types. | 255 // resource types. |
243 IPC_MESSAGE_CONTROL0(ChromeViewMsg_GetCacheResourceStats) | 256 IPC_MESSAGE_CONTROL0(ChromeViewMsg_GetCacheResourceStats) |
244 | 257 |
245 // Asks the renderer to send back Histograms. | 258 // Asks the renderer to send back Histograms. |
246 IPC_MESSAGE_CONTROL1(ChromeViewMsg_GetRendererHistograms, | 259 IPC_MESSAGE_CONTROL1(ChromeViewMsg_GetRendererHistograms, |
247 int /* sequence number of Renderer Histograms. */) | 260 int /* sequence number of Renderer Histograms. */) |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
618 // previous SetCookie message to be processed. | 631 // previous SetCookie message to be processed. |
619 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, | 632 IPC_SYNC_MESSAGE_ROUTED2_1(ChromeViewHostMsg_GetCookies, |
620 GURL /* url */, | 633 GURL /* url */, |
621 GURL /* first_party_for_cookies */, | 634 GURL /* first_party_for_cookies */, |
622 std::string /* cookies */) | 635 std::string /* cookies */) |
623 | 636 |
624 // Provide the browser process with current renderer framerate. | 637 // Provide the browser process with current renderer framerate. |
625 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, | 638 IPC_MESSAGE_CONTROL2(ChromeViewHostMsg_FPS, |
626 int /* routing id */, | 639 int /* routing id */, |
627 float /* frames per second */) | 640 float /* frames per second */) |
OLD | NEW |