diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:03:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-29 23:03:57 +0000 |
| commit | 2dd868ff64f453c0da93c072986e1389836e8728 (patch) | |
| tree | 89b767170d28968ffcdc7cf2b0770cfa2516da74 /content/common | |
| parent | e8981b7eda49d88b74239c6c5dad5d0dd093a142 (diff) | |
| download | chromium_src-2dd868ff64f453c0da93c072986e1389836e8728.zip chromium_src-2dd868ff64f453c0da93c072986e1389836e8728.tar.gz chromium_src-2dd868ff64f453c0da93c072986e1389836e8728.tar.bz2 | |
Stop using the default profile's proxy service for plugin proxy requests, and instead use the associated profile's proxy service. I proxy the IPC through the renderer first, as that makes it easy to get to the associated profile.
BUG=92361,64339
Review URL: http://codereview.chromium.org/7791005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
| -rw-r--r-- | content/common/child_process_messages.h | 11 | ||||
| -rw-r--r-- | content/common/plugin_messages.h | 5 | ||||
| -rw-r--r-- | content/common/view_messages.h | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h index 1d64bf6..6c7b7fd 100644 --- a/content/common/child_process_messages.h +++ b/content/common/child_process_messages.h @@ -52,14 +52,3 @@ IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TraceDataCollected, // Reply to ChildProcessMsg_GetTraceBufferPercentFull. IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TraceBufferPercentFullReply, float /*trace buffer percent full*/) - -// NaCl's 64 bit Windows build only links with a bare-minimum number of -// libraries, and GURL isn't one of them. -#if !defined(NACL_WIN64) -// Get the list of proxies to use for |url|, as a semicolon delimited list -// of "<TYPE> <HOST>:<PORT>" | "DIRECT". -IPC_SYNC_MESSAGE_CONTROL1_2(ChildProcessHostMsg_ResolveProxy, - GURL /* url */, - int /* network error */, - std::string /* proxy list */) -#endif diff --git a/content/common/plugin_messages.h b/content/common/plugin_messages.h index 4909bc2..dd65ce9 100644 --- a/content/common/plugin_messages.h +++ b/content/common/plugin_messages.h @@ -329,6 +329,11 @@ IPC_SYNC_MESSAGE_ROUTED1_1(PluginHostMsg_GetPluginElement, int /* route id */, bool /* success */) +IPC_SYNC_MESSAGE_ROUTED1_2(PluginHostMsg_ResolveProxy, + GURL /* url */, + bool /* result */, + std::string /* proxy list */) + IPC_MESSAGE_ROUTED3(PluginHostMsg_SetCookie, GURL /* url */, GURL /* first_party_for_cookies */, diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 2798a26..a91a857 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -1596,6 +1596,13 @@ IPC_SYNC_MESSAGE_CONTROL3_2(ViewHostMsg_OpenChannelToPlugin, IPC::ChannelHandle /* channel_handle */, webkit::WebPluginInfo /* info */) +// Get the list of proxies to use for |url|, as a semicolon delimited list +// of "<TYPE> <HOST>:<PORT>" | "DIRECT". +IPC_SYNC_MESSAGE_CONTROL1_2(ViewHostMsg_ResolveProxy, + GURL /* url */, + bool /* result */, + std::string /* proxy list */) + // A renderer sends this to the browser process when it wants to create a // worker. The browser will create the worker process if necessary, and // will return the route id on success. On error returns MSG_ROUTING_NONE. |