summaryrefslogtreecommitdiffstats
path: root/content/public/common
diff options
context:
space:
mode:
authoracleung@google.com <acleung@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 23:57:39 +0000
committeracleung@google.com <acleung@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-03 23:57:39 +0000
commit29699c2a6d0d17b2b62e998d31fa96dff5d2341b (patch)
tree66e82f577451c3f7bd8bc3a6f64c63535e281381 /content/public/common
parent3b11aab3f0b143ef3e67f9028f6e8d388b7e4ca5 (diff)
downloadchromium_src-29699c2a6d0d17b2b62e998d31fa96dff5d2341b.zip
chromium_src-29699c2a6d0d17b2b62e998d31fa96dff5d2341b.tar.gz
chromium_src-29699c2a6d0d17b2b62e998d31fa96dff5d2341b.tar.bz2
Additional file descriptor mappings.
BUG=142668 Review URL: https://chromiumcodereview.appspot.com/10876056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/common')
-rw-r--r--content/public/common/content_descriptors.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/content/public/common/content_descriptors.h b/content/public/common/content_descriptors.h
index a637342..2ec82e8 100644
--- a/content/public/common/content_descriptors.h
+++ b/content/public/common/content_descriptors.h
@@ -11,7 +11,15 @@
// base::GlobalDescriptors object (see base/global_descriptors_posix.h)
enum {
kCrashDumpSignal = kPrimaryIPCChannel + 1,
- kSandboxIPCChannel = kPrimaryIPCChannel + 2, // http://code.google.com/p/chromium/LinuxSandboxIPC
+ kSandboxIPCChannel, // http://code.google.com/p/chromium/LinuxSandboxIPC
+
+#if defined(OS_ANDROID)
+ kAndroidPropertyDescriptor,
+#endif
+
+ // The first key that embedders can use to register descriptors (see
+ // base/global_descriptors_posix.h).
+ kContentIPCDescriptorMax
};
#endif // CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_