Additional file descriptor mappings for Android

content/public/common/content_descriptors.h

Index: content/public/common/content_descriptors.h
diff --git a/content/public/common/content_descriptors.h b/content/public/common/content_descriptors.h
index a6373425b63cbb4a2ac190b5f613e2d215e39066..179bc4a6719b8f218b8643eaca73d41f092683d5 100644
--- a/content/public/common/content_descriptors.h
+++ b/content/public/common/content_descriptors.h
@@ -10,8 +10,18 @@
 // This is a list of global descriptor keys to be used with the
 // base::GlobalDescriptors object (see base/global_descriptors_posix.h)
 enum {
+  // Sets the initial descriptor value. Subsequence descriptors will

[jam, 2012/10/03 16:04:06]

this comment is just describing the code, so not needed

[acleung, 2012/10/03 18:29:39]

Done.

+  // be incremented based on its ordinal.
   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_