| 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 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 7 #if !defined(CHROME_MULTIPLE_DLL_CHILD) |
| 8 #include "content/public/browser/content_browser_client.h" | 8 #include "content/public/browser/content_browser_client.h" |
| 9 #endif | 9 #endif |
| 10 | 10 |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 } | 43 } |
| 44 | 44 |
| 45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) | 45 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) |
| 46 | 46 |
| 47 void ContentMainDelegate::ZygoteStarting( | 47 void ContentMainDelegate::ZygoteStarting( |
| 48 ScopedVector<ZygoteForkDelegate>* delegates) { | 48 ScopedVector<ZygoteForkDelegate>* delegates) { |
| 49 } | 49 } |
| 50 | 50 |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 bool ContentMainDelegate::ShouldEnableTerminationOnHeapCorruption() { | |
| 54 return true; | |
| 55 } | |
| 56 | |
| 57 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { | 53 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { |
| 58 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 54 #if defined(CHROME_MULTIPLE_DLL_CHILD) |
| 59 return NULL; | 55 return NULL; |
| 60 #else | 56 #else |
| 61 return new ContentBrowserClient(); | 57 return new ContentBrowserClient(); |
| 62 #endif | 58 #endif |
| 63 } | 59 } |
| 64 | 60 |
| 65 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { | 61 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { |
| 66 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 62 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) |
| (...skipping 13 matching lines...) Expand all Loading... |
| 80 | 76 |
| 81 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 77 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { |
| 82 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 78 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 83 return NULL; | 79 return NULL; |
| 84 #else | 80 #else |
| 85 return new ContentUtilityClient(); | 81 return new ContentUtilityClient(); |
| 86 #endif | 82 #endif |
| 87 } | 83 } |
| 88 | 84 |
| 89 } // namespace content | 85 } // namespace content |
| OLD | NEW |