summaryrefslogtreecommitdiffstats
path: root/base/global_descriptors_posix.h
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 11:24:18 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-22 11:24:18 +0000
commita1733df46d06f88f1d212de14a0ba352a5383731 (patch)
tree8e9a28182476243cc4e1a75195b31784f7fac7c7 /base/global_descriptors_posix.h
parent194513ba2f5bf646af80045839f8a3872e19cd8a (diff)
downloadchromium_src-a1733df46d06f88f1d212de14a0ba352a5383731.zip
chromium_src-a1733df46d06f88f1d212de14a0ba352a5383731.tar.gz
chromium_src-a1733df46d06f88f1d212de14a0ba352a5383731.tar.bz2
Refactor GetCrashSignalFD to be more generic.
Enables us to pass more file descriptors down to the child process. This will be used by the Android port. As part of this, I cleaned up a ChildProcessLauncher::Context::LaunchInternal to be a little more generic. This can result in a little extra work but cleans up the zygote/non-zygote code paths. Review URL: https://chromiumcodereview.appspot.com/10584007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/global_descriptors_posix.h')
-rw-r--r--base/global_descriptors_posix.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/base/global_descriptors_posix.h b/base/global_descriptors_posix.h
index 452afa7..988809e 100644
--- a/base/global_descriptors_posix.h
+++ b/base/global_descriptors_posix.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
@@ -37,7 +37,8 @@ namespace base {
class BASE_EXPORT GlobalDescriptors {
public:
typedef uint32_t Key;
- typedef std::vector<std::pair<Key, int> > Mapping;
+ typedef std::pair<Key, int> KeyFDPair;
+ typedef std::vector<KeyFDPair> Mapping;
// Often we want a canonical descriptor for a given Key. In this case, we add
// the following constant to the key value: