Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(81)

Side by Side Diff: content/public/common/content_descriptors.h

Issue 2075283003: Remove natives_blob.bin's arch dependence. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | gin/v8_initializer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_
6 #define CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ 6 #define CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "ipc/ipc_descriptors.h" 9 #include "ipc/ipc_descriptors.h"
10 10
11 // This is a list of global descriptor keys to be used with the 11 // This is a list of global descriptor keys to be used with the
12 // base::GlobalDescriptors object (see base/posix/global_descriptors.h) 12 // base::GlobalDescriptors object (see base/posix/global_descriptors.h)
13 enum { 13 enum {
14 kCrashDumpSignal = kIPCDescriptorMax, 14 kCrashDumpSignal = kIPCDescriptorMax,
15 kSandboxIPCChannel, // https://chromium.googlesource.com/chromium/src/+/maste r/docs/linux_sandbox_ipc.md 15 kSandboxIPCChannel, // https://chromium.googlesource.com/chromium/src/+/maste r/docs/linux_sandbox_ipc.md
16 kMojoIPCChannel, 16 kMojoIPCChannel,
17 kV8NativesDataDescriptor,
Torne 2016/06/20 13:10:50 This should still be inside the #ifdef V8_USE_EXTE
michaelbai 2016/06/20 18:52:03 oops, thanks for spotting this.
17 18
18 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) 19 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
19 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
20 kV8NativesDataDescriptor32,
21 kV8SnapshotDataDescriptor32, 21 kV8SnapshotDataDescriptor32,
22 kV8NativesDataDescriptor64,
23 kV8SnapshotDataDescriptor64, 22 kV8SnapshotDataDescriptor64,
24 #else 23 #else
25 kV8NativesDataDescriptor,
26 kV8SnapshotDataDescriptor, 24 kV8SnapshotDataDescriptor,
27 #endif 25 #endif
28 #endif 26 #endif
29 27
30 #if defined(OS_ANDROID) 28 #if defined(OS_ANDROID)
31 kAndroidPropertyDescriptor, 29 kAndroidPropertyDescriptor,
32 kAndroidICUDataDescriptor, 30 kAndroidICUDataDescriptor,
33 #endif 31 #endif
34 32
35 // The first key that embedders can use to register descriptors (see 33 // The first key that embedders can use to register descriptors (see
36 // base/posix/global_descriptors.h). 34 // base/posix/global_descriptors.h).
37 kContentIPCDescriptorMax 35 kContentIPCDescriptorMax
38 }; 36 };
39 37
40 #endif // CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_ 38 #endif // CONTENT_PUBLIC_COMMON_CONTENT_DESCRIPTORS_H_
OLDNEW
« no previous file with comments | « content/browser/child_process_launcher.cc ('k') | gin/v8_initializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698