| 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 "content/public/browser/content_browser_client.h" | 7 #include "content/public/browser/content_browser_client.h" |
| 8 | 8 |
| 9 #if !defined(OS_IOS) | 9 #if !defined(OS_IOS) |
| 10 #include "content/public/plugin/content_plugin_client.h" | 10 #include "content/public/plugin/content_plugin_client.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 return true; | 35 return true; |
| 36 } | 36 } |
| 37 | 37 |
| 38 bool ContentMainDelegate::DelaySandboxInitialization( | 38 bool ContentMainDelegate::DelaySandboxInitialization( |
| 39 const std::string& process_type) { | 39 const std::string& process_type) { |
| 40 return false; | 40 return false; |
| 41 } | 41 } |
| 42 | 42 |
| 43 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) | 43 #elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_IOS) |
| 44 | 44 |
| 45 ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() { | 45 void ContentMainDelegate::ZygoteStarting( |
| 46 return NULL; | 46 ScopedVector<ZygoteForkDelegate>* delegates) { |
| 47 } | 47 } |
| 48 | 48 |
| 49 #endif | 49 #endif |
| 50 | 50 |
| 51 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { | 51 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { |
| 52 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 52 #if defined(CHROME_MULTIPLE_DLL_CHILD) |
| 53 return NULL; | 53 return NULL; |
| 54 #else | 54 #else |
| 55 return new ContentBrowserClient(); | 55 return new ContentBrowserClient(); |
| 56 #endif | 56 #endif |
| (...skipping 17 matching lines...) Expand all Loading... |
| 74 | 74 |
| 75 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 75 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { |
| 76 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 76 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 77 return NULL; | 77 return NULL; |
| 78 #else | 78 #else |
| 79 return new ContentUtilityClient(); | 79 return new ContentUtilityClient(); |
| 80 #endif | 80 #endif |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace content | 83 } // namespace content |
| OLD | NEW |