| Index: content/public/app/content_main_delegate.h
|
| diff --git a/content/public/app/content_main_delegate.h b/content/public/app/content_main_delegate.h
|
| index 1dcb57fadee6d9426d4cda66c545e1e06c61e8f3..a94502f20062750d199f1b652501316811ac91c2 100644
|
| --- a/content/public/app/content_main_delegate.h
|
| +++ b/content/public/app/content_main_delegate.h
|
| @@ -5,14 +5,13 @@
|
| #ifndef CONTENT_PUBLIC_APP_CONTENT_MAIN_DELEGATE_H_
|
| #define CONTENT_PUBLIC_APP_CONTENT_MAIN_DELEGATE_H_
|
|
|
| +#include <memory>
|
| #include <string>
|
| +#include <vector>
|
|
|
| #include "build/build_config.h"
|
| #include "content/common/content_export.h"
|
|
|
| -template <typename>
|
| -class ScopedVector;
|
| -
|
| namespace content {
|
|
|
| class ContentBrowserClient;
|
| @@ -70,7 +69,8 @@ class CONTENT_EXPORT ContentMainDelegate {
|
| // Tells the embedder that the zygote process is starting, and allows it to
|
| // specify one or more zygote delegates if it wishes by storing them in
|
| // |*delegates|.
|
| - virtual void ZygoteStarting(ScopedVector<ZygoteForkDelegate>* delegates);
|
| + virtual void ZygoteStarting(
|
| + std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates);
|
|
|
| // Called every time the zygote process forks.
|
| virtual void ZygoteForked() {}
|
|
|