| Index: content/public/common/content_descriptors.h
|
| diff --git a/content/public/common/content_descriptors.h b/content/public/common/content_descriptors.h
|
| index db9720150485949e3676cf51c8b33c9f4a81269e..9b1ecc0759e5cde57080d2fb27e6cd25031d1804 100644
|
| --- a/content/public/common/content_descriptors.h
|
| +++ b/content/public/common/content_descriptors.h
|
| @@ -13,15 +13,14 @@ enum {
|
| kCrashDumpSignal = kIPCDescriptorMax,
|
| kSandboxIPCChannel, // http://code.google.com/p/chromium/LinuxSandboxIPC
|
|
|
| -#if defined(OS_ANDROID)
|
| - kAndroidPropertyDescriptor,
|
| - kAndroidICUDataDescriptor,
|
| -
|
| -#ifdef V8_USE_EXTERNAL_STARTUP_DATA
|
| +#if defined(V8_USE_EXTERNAL_STARTUP_DATA)
|
| kV8NativesDataDescriptor,
|
| kV8SnapshotDataDescriptor,
|
| #endif
|
|
|
| +#if defined(OS_ANDROID)
|
| + kAndroidPropertyDescriptor,
|
| + kAndroidICUDataDescriptor,
|
| #endif
|
|
|
| // The first key that embedders can use to register descriptors (see
|
|
|