summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 00:01:08 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-22 00:01:08 +0000
commit9e78ba23332c190da86ee478649d4c1bb1812e52 (patch)
tree8ec16ff9159a2b27c63b944b26b7b47793c11356 /components
parent3a668152e094f68f62b34b44db6b0249691773b4 (diff)
downloadchromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.zip
chromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.tar.gz
chromium_src-9e78ba23332c190da86ee478649d4c1bb1812e52.tar.bz2
Revert r207951 - "Separate NaCl switches to their own file."
This change doesn't build under xcode for some reason. See http://build.chromium.org/p/chromium.webkit/builders/Mac%20Builder%20%28dbg%29/builds/28702 TBR=thakis@chromium.org, yael.aharon@intel.com BUG=244791 Review URL: https://codereview.chromium.org/16867015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/nacl/OWNERS6
-rw-r--r--components/nacl/common/nacl_switches.cc39
-rw-r--r--components/nacl/common/nacl_switches.h24
-rw-r--r--components/nacl_common.gypi41
4 files changed, 0 insertions, 110 deletions
diff --git a/components/nacl/OWNERS b/components/nacl/OWNERS
deleted file mode 100644
index 8345057..0000000
--- a/components/nacl/OWNERS
+++ /dev/null
@@ -1,6 +0,0 @@
-bradchen@chromium.org
-bradnelson@chromium.org
-jvoung@chromium.org
-mseaborn@chromium.org
-noelallen@chromium.org
-sehr@chromium.org
diff --git a/components/nacl/common/nacl_switches.cc b/components/nacl/common/nacl_switches.cc
deleted file mode 100644
index d2a01d5..0000000
--- a/components/nacl/common/nacl_switches.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "components/nacl/common/nacl_switches.h"
-
-namespace switches {
-
-// Causes the process to run as a NativeClient broker
-// (used for launching NaCl loader processes on 64-bit Windows).
-const char kNaClBrokerProcess[] = "nacl-broker";
-
-// Uses NaCl manifest URL to choose whether NaCl program will be debugged by
-// debug stub.
-// Switch value format: [!]pattern1,pattern2,...,patternN. Each pattern uses
-// the same syntax as patterns in Chrome extension manifest. The only difference
-// is that * scheme matches all schemes instead of matching only http and https.
-// If the value doesn't start with !, a program will be debugged if manifest URL
-// matches any pattern. If the value starts with !, a program will be debugged
-// if manifest URL does not match any pattern.
-const char kNaClDebugMask[] = "nacl-debug-mask";
-
-// Native Client GDB debugger that will be launched automatically when needed.
-const char kNaClGdb[] = "nacl-gdb";
-
-// GDB script to pass to the nacl-gdb debugger at startup.
-const char kNaClGdbScript[] = "nacl-gdb-script";
-
-// On POSIX only: the contents of this flag are prepended to the nacl-loader
-// command line. Useful values might be "valgrind" or "xterm -e gdb --args".
-const char kNaClLoaderCmdPrefix[] = "nacl-loader-cmd-prefix";
-
-// Causes the process to run as a NativeClient loader.
-const char kNaClLoaderProcess[] = "nacl-loader";
-
-// Runs the security test for the NaCl loader sandbox.
-const char kTestNaClSandbox[] = "test-nacl-sandbox";
-
-} // namespace switches
diff --git a/components/nacl/common/nacl_switches.h b/components/nacl/common/nacl_switches.h
deleted file mode 100644
index 132ac7a..0000000
--- a/components/nacl/common/nacl_switches.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Defines all the command-line switches used by Chrome.
-
-#ifndef COMPONENTS_NACL_COMMON_NACL_SWITCHES_H_
-#define COMPONENTS_NACL_COMMON_NACL_SWITCHES_H_
-
-namespace switches {
-
-// All switches in alphabetical order. The switches should be documented
-// alongside the definition of their values in the .cc file.
-extern const char kNaClBrokerProcess[];
-extern const char kNaClDebugMask[];
-extern const char kNaClGdb[];
-extern const char kNaClGdbScript[];
-extern const char kNaClLoaderCmdPrefix[];
-extern const char kNaClLoaderProcess[];
-extern const char kTestNaClSandbox[];
-
-} // namespace switches
-
-#endif // COMPONENTS_NACL_COMMON_NACL_SWITCHES_H_
diff --git a/components/nacl_common.gypi b/components/nacl_common.gypi
deleted file mode 100644
index 00137c5..0000000
--- a/components/nacl_common.gypi
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
- 'targets': [
- {
- 'target_name': 'nacl_switches',
- 'type': 'static_library',
- 'sources': [
- 'nacl/common/nacl_switches.cc',
- 'nacl/common/nacl_switches.h',
- ],
- 'include_dirs': [
- '..',
- ],
- },
- ],
- 'conditions': [
- ['OS=="win" and target_arch=="ia32"', {
- 'targets': [
- {
- 'target_name': 'nacl_switches_win64',
- 'type': 'static_library',
- 'sources': [
- 'nacl/common/nacl_switches.cc',
- 'nacl/common/nacl_switches.h',
- ],
- 'include_dirs': [
- '..',
- ],
- 'configurations': {
- 'Common_Base': {
- 'msvs_target_platform': 'x64',
- },
- },
- },
- ],
- }],
- ],
-}