| 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..2ec82e8969ba991dc16759231982fc1628dcb80e 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_
|
|
|