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

Side by Side Diff: chrome/browser/nacl_host/nacl_process_host.cc

Issue 13812005: net: move socket files from net/base to net/socket (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyp Created 7 years, 8 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 "chrome/browser/nacl_host/nacl_process_host.h" 5 #include "chrome/browser/nacl_host/nacl_process_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 28 matching lines...) Expand all
39 #include "content/public/browser/browser_ppapi_host.h" 39 #include "content/public/browser/browser_ppapi_host.h"
40 #include "content/public/browser/child_process_data.h" 40 #include "content/public/browser/child_process_data.h"
41 #include "content/public/common/child_process_host.h" 41 #include "content/public/common/child_process_host.h"
42 #include "content/public/common/process_type.h" 42 #include "content/public/common/process_type.h"
43 #include "extensions/common/constants.h" 43 #include "extensions/common/constants.h"
44 #include "extensions/common/url_pattern.h" 44 #include "extensions/common/url_pattern.h"
45 #include "ipc/ipc_channel.h" 45 #include "ipc/ipc_channel.h"
46 #include "ipc/ipc_switches.h" 46 #include "ipc/ipc_switches.h"
47 #include "native_client/src/shared/imc/nacl_imc_c.h" 47 #include "native_client/src/shared/imc/nacl_imc_c.h"
48 #include "net/base/net_util.h" 48 #include "net/base/net_util.h"
49 #include "net/base/tcp_listen_socket.h" 49 #include "net/socket/tcp_listen_socket.h"
50 #include "ppapi/proxy/ppapi_messages.h" 50 #include "ppapi/proxy/ppapi_messages.h"
51 51
52 #if defined(OS_POSIX) 52 #if defined(OS_POSIX)
53 #include <fcntl.h> 53 #include <fcntl.h>
54 54
55 #include "ipc/ipc_channel_posix.h" 55 #include "ipc/ipc_channel_posix.h"
56 #elif defined(OS_WIN) 56 #elif defined(OS_WIN)
57 #include <windows.h> 57 #include <windows.h>
58 58
59 #include "base/process_util.h" 59 #include "base/process_util.h"
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 } else { 971 } else {
972 NaClStartDebugExceptionHandlerThread( 972 NaClStartDebugExceptionHandlerThread(
973 process_handle.Take(), info, 973 process_handle.Take(), info,
974 base::MessageLoopProxy::current(), 974 base::MessageLoopProxy::current(),
975 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 975 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
976 weak_factory_.GetWeakPtr())); 976 weak_factory_.GetWeakPtr()));
977 return true; 977 return true;
978 } 978 }
979 } 979 }
980 #endif 980 #endif
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_process_host.h ('k') | chrome/test/chromedriver/net/net_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698