diff options
| author | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:17:47 +0000 |
|---|---|---|
| committer | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-11 01:17:47 +0000 |
| commit | 54ad01a07a6c2ffa6ee2d2ec11cd6d56b723cd5e (patch) | |
| tree | ee8f209267515175b3c9c11a52c1fce9a699c675 /content/public/app | |
| parent | 5cf28ab789a0fa2faf5050b8a60e296f25e808c6 (diff) | |
| download | chromium_src-54ad01a07a6c2ffa6ee2d2ec11cd6d56b723cd5e.zip chromium_src-54ad01a07a6c2ffa6ee2d2ec11cd6d56b723cd5e.tar.gz chromium_src-54ad01a07a6c2ffa6ee2d2ec11cd6d56b723cd5e.tar.bz2 | |
Add support for multiple zygote fork delegates
No functional changes yet, just preparation for splitting NaCl's fork
delegate into two different implementations.
BUG=364945
Review URL: https://codereview.chromium.org/269413004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/app')
| -rw-r--r-- | content/public/app/content_main_delegate.cc | 4 | ||||
| -rw-r--r-- | content/public/app/content_main_delegate.h | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/content/public/app/content_main_delegate.cc b/content/public/app/content_main_delegate.cc index 88ce4aa..433300c 100644 --- a/content/public/app/content_main_delegate.cc +++ b/content/public/app/content_main_delegate.cc @@ -42,8 +42,8 @@ bool ContentMainDelegate::DelaySandboxInitialization( #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) -ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() { - return NULL; +void ContentMainDelegate::ZygoteStarting( + ScopedVector<ZygoteForkDelegate>* delegates) { } #endif diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h index 9b94b98..6191d78 100644 --- a/content/public/app/content_main_delegate.h +++ b/content/public/app/content_main_delegate.h @@ -10,6 +10,9 @@ #include "build/build_config.h" #include "content/common/content_export.h" +template <typename> +class ScopedVector; + namespace content { class ContentBrowserClient; @@ -65,8 +68,9 @@ class CONTENT_EXPORT ContentMainDelegate { #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) // Tells the embedder that the zygote process is starting, and allows it to - // specify a zygote delegate if it wishes. - virtual ZygoteForkDelegate* ZygoteStarting(); + // specify one or more zygote delegates if it wishes by storing them in + // |*delegates|. + virtual void ZygoteStarting(ScopedVector<ZygoteForkDelegate>* delegates); // Called every time the zygote process forks. virtual void ZygoteForked() {} |