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

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

Issue 16867015: Revert r207951 - "Separate NaCl switches to their own file." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 18 matching lines...) Expand all
29 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h" 29 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory .h"
30 #include "chrome/common/chrome_paths.h" 30 #include "chrome/common/chrome_paths.h"
31 #include "chrome/common/chrome_process_type.h" 31 #include "chrome/common/chrome_process_type.h"
32 #include "chrome/common/chrome_switches.h" 32 #include "chrome/common/chrome_switches.h"
33 #include "chrome/common/chrome_version_info.h" 33 #include "chrome/common/chrome_version_info.h"
34 #include "chrome/common/logging_chrome.h" 34 #include "chrome/common/logging_chrome.h"
35 #include "chrome/common/nacl_cmd_line.h" 35 #include "chrome/common/nacl_cmd_line.h"
36 #include "chrome/common/nacl_host_messages.h" 36 #include "chrome/common/nacl_host_messages.h"
37 #include "chrome/common/nacl_messages.h" 37 #include "chrome/common/nacl_messages.h"
38 #include "chrome/common/render_messages.h" 38 #include "chrome/common/render_messages.h"
39 #include "components/nacl/common/nacl_switches.h"
40 #include "content/public/browser/browser_child_process_host.h" 39 #include "content/public/browser/browser_child_process_host.h"
41 #include "content/public/browser/browser_ppapi_host.h" 40 #include "content/public/browser/browser_ppapi_host.h"
42 #include "content/public/browser/child_process_data.h" 41 #include "content/public/browser/child_process_data.h"
43 #include "content/public/common/child_process_host.h" 42 #include "content/public/common/child_process_host.h"
44 #include "content/public/common/process_type.h" 43 #include "content/public/common/process_type.h"
45 #include "extensions/common/constants.h" 44 #include "extensions/common/constants.h"
46 #include "ipc/ipc_channel.h" 45 #include "ipc/ipc_channel.h"
47 #include "ipc/ipc_switches.h" 46 #include "ipc/ipc_switches.h"
48 #include "native_client/src/shared/imc/nacl_imc_c.h" 47 #include "native_client/src/shared/imc/nacl_imc_c.h"
49 #include "net/base/net_util.h" 48 #include "net/base/net_util.h"
(...skipping 877 matching lines...) Expand 10 before | Expand all | Expand 10 after
927 } else { 926 } else {
928 NaClStartDebugExceptionHandlerThread( 927 NaClStartDebugExceptionHandlerThread(
929 process_handle.Take(), info, 928 process_handle.Take(), info,
930 base::MessageLoopProxy::current(), 929 base::MessageLoopProxy::current(),
931 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker, 930 base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
932 weak_factory_.GetWeakPtr())); 931 weak_factory_.GetWeakPtr()));
933 return true; 932 return true;
934 } 933 }
935 } 934 }
936 #endif 935 #endif
OLDNEW
« no previous file with comments | « chrome/browser/nacl_host/nacl_broker_host_win.cc ('k') | chrome/browser/nacl_host/test/nacl_gdb_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698