OLD | NEW |
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 #include "content/public/app/content_main_delegate.h" | 5 #include "content/public/app/content_main_delegate.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 #include "content/public/gpu/content_gpu_client.h" | 9 #include "content/public/gpu/content_gpu_client.h" |
10 #include "content/public/renderer/content_renderer_client.h" | 10 #include "content/public/renderer/content_renderer_client.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 } | 38 } |
39 | 39 |
40 bool ContentMainDelegate::DelaySandboxInitialization( | 40 bool ContentMainDelegate::DelaySandboxInitialization( |
41 const std::string& process_type) { | 41 const std::string& process_type) { |
42 return false; | 42 return false; |
43 } | 43 } |
44 | 44 |
45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) | 45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) |
46 | 46 |
47 void ContentMainDelegate::ZygoteStarting( | 47 void ContentMainDelegate::ZygoteStarting( |
48 ScopedVector<ZygoteForkDelegate>* delegates) { | 48 std::vector<std::unique_ptr<ZygoteForkDelegate>>* delegates) {} |
49 } | |
50 | 49 |
51 #endif | 50 #endif |
52 | 51 |
53 bool ContentMainDelegate::ShouldEnableProfilerRecording() { | 52 bool ContentMainDelegate::ShouldEnableProfilerRecording() { |
54 return false; | 53 return false; |
55 } | 54 } |
56 | 55 |
57 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { | 56 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { |
58 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 57 #if defined(CHROME_MULTIPLE_DLL_CHILD) |
59 return NULL; | 58 return NULL; |
(...skipping 20 matching lines...) Expand all Loading... |
80 | 79 |
81 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 80 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { |
82 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 81 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
83 return NULL; | 82 return NULL; |
84 #else | 83 #else |
85 return new ContentUtilityClient(); | 84 return new ContentUtilityClient(); |
86 #endif | 85 #endif |
87 } | 86 } |
88 | 87 |
89 } // namespace content | 88 } // namespace content |
OLD | NEW |