Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(391)

Side by Side Diff: content/browser/resolve_proxy_msg_helper.cc

Issue 292443004: Remove IPC_BEGIN_MESSAGE_MAP_EX macro since r270839 made all bad IPCs kill their child processes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/browser/resolve_proxy_msg_helper.h" 5 #include "content/browser/resolve_proxy_msg_helper.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
11 #include "net/base/net_errors.h" 11 #include "net/base/net_errors.h"
12 #include "net/url_request/url_request_context.h" 12 #include "net/url_request/url_request_context.h"
13 #include "net/url_request/url_request_context_getter.h" 13 #include "net/url_request/url_request_context_getter.h"
14 14
15 namespace content { 15 namespace content {
16 16
17 ResolveProxyMsgHelper::ResolveProxyMsgHelper( 17 ResolveProxyMsgHelper::ResolveProxyMsgHelper(
18 net::URLRequestContextGetter* getter) 18 net::URLRequestContextGetter* getter)
19 : BrowserMessageFilter(ViewMsgStart), 19 : BrowserMessageFilter(ViewMsgStart),
20 context_getter_(getter), 20 context_getter_(getter),
21 proxy_service_(NULL) { 21 proxy_service_(NULL) {
22 } 22 }
23 23
24 ResolveProxyMsgHelper::ResolveProxyMsgHelper(net::ProxyService* proxy_service) 24 ResolveProxyMsgHelper::ResolveProxyMsgHelper(net::ProxyService* proxy_service)
25 : BrowserMessageFilter(ViewMsgStart), 25 : BrowserMessageFilter(ViewMsgStart),
26 proxy_service_(proxy_service) { 26 proxy_service_(proxy_service) {
27 } 27 }
28 28
29 bool ResolveProxyMsgHelper::OnMessageReceived(const IPC::Message& message, 29 bool ResolveProxyMsgHelper::OnMessageReceived(const IPC::Message& message) {
30 bool* message_was_ok) {
31 bool handled = true; 30 bool handled = true;
32 IPC_BEGIN_MESSAGE_MAP_EX(ResolveProxyMsgHelper, message, *message_was_ok) 31 IPC_BEGIN_MESSAGE_MAP(ResolveProxyMsgHelper, message)
33 IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy) 32 IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy)
34 IPC_MESSAGE_UNHANDLED(handled = false) 33 IPC_MESSAGE_UNHANDLED(handled = false)
35 IPC_END_MESSAGE_MAP() 34 IPC_END_MESSAGE_MAP()
36 return handled; 35 return handled;
37 } 36 }
38 37
39 void ResolveProxyMsgHelper::OnResolveProxy(const GURL& url, 38 void ResolveProxyMsgHelper::OnResolveProxy(const GURL& url,
40 IPC::Message* reply_msg) { 39 IPC::Message* reply_msg) {
41 // Enqueue the pending request. 40 // Enqueue the pending request.
42 pending_requests_.push_back(PendingRequest(url, reply_msg)); 41 pending_requests_.push_back(PendingRequest(url, reply_msg));
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted, 95 base::Bind(&ResolveProxyMsgHelper::OnResolveProxyCompleted,
97 base::Unretained(this)), 96 base::Unretained(this)),
98 &req.pac_req, net::BoundNetLog()); 97 &req.pac_req, net::BoundNetLog());
99 98
100 // Completed synchronously. 99 // Completed synchronously.
101 if (result != net::ERR_IO_PENDING) 100 if (result != net::ERR_IO_PENDING)
102 OnResolveProxyCompleted(result); 101 OnResolveProxyCompleted(result);
103 } 102 }
104 103
105 } // namespace content 104 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/resolve_proxy_msg_helper.h ('k') | content/browser/screen_orientation/screen_orientation_dispatcher_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698