| 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 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 9 #if !defined(CHROME_MULTIPLE_DLL_CHILD) | 
| 10 #include "content/public/browser/content_browser_client.h" | 10 #include "content/public/browser/content_browser_client.h" | 
| 11 #endif | 11 #endif | 
| 12 | 12 | 
| 13 #if !defined(OS_IOS) | 13 #if !defined(OS_IOS) | 
|  | 14 #include "content/public/gpu/content_gpu_client.h" | 
| 14 #include "content/public/plugin/content_plugin_client.h" | 15 #include "content/public/plugin/content_plugin_client.h" | 
| 15 #include "content/public/renderer/content_renderer_client.h" | 16 #include "content/public/renderer/content_renderer_client.h" | 
| 16 #include "content/public/utility/content_utility_client.h" | 17 #include "content/public/utility/content_utility_client.h" | 
| 17 #endif | 18 #endif | 
| 18 | 19 | 
| 19 namespace content { | 20 namespace content { | 
| 20 | 21 | 
| 21 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) { | 22 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) { | 
| 22   return false; | 23   return false; | 
| 23 } | 24 } | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 57 } | 58 } | 
| 58 | 59 | 
| 59 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { | 60 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { | 
| 60 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 61 #if defined(CHROME_MULTIPLE_DLL_CHILD) | 
| 61   return NULL; | 62   return NULL; | 
| 62 #else | 63 #else | 
| 63   return new ContentBrowserClient(); | 64   return new ContentBrowserClient(); | 
| 64 #endif | 65 #endif | 
| 65 } | 66 } | 
| 66 | 67 | 
|  | 68 ContentGpuClient* ContentMainDelegate::CreateContentGpuClient() { | 
|  | 69 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 
|  | 70   return NULL; | 
|  | 71 #else | 
|  | 72   return new ContentGpuClient(); | 
|  | 73 #endif | 
|  | 74 } | 
|  | 75 | 
| 67 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { | 76 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { | 
| 68 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 77 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 
| 69   return NULL; | 78   return NULL; | 
| 70 #else | 79 #else | 
| 71   return new ContentPluginClient(); | 80   return new ContentPluginClient(); | 
| 72 #endif | 81 #endif | 
| 73 } | 82 } | 
| 74 | 83 | 
| 75 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { | 84 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { | 
| 76 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 85 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 
| 77   return NULL; | 86   return NULL; | 
| 78 #else | 87 #else | 
| 79   return new ContentRendererClient(); | 88   return new ContentRendererClient(); | 
| 80 #endif | 89 #endif | 
| 81 } | 90 } | 
| 82 | 91 | 
| 83 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 92 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 
| 84 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 93 #if defined(OS_IOS) || defined(CHROME_MULTIPLE_DLL_BROWSER) | 
| 85   return NULL; | 94   return NULL; | 
| 86 #else | 95 #else | 
| 87   return new ContentUtilityClient(); | 96   return new ContentUtilityClient(); | 
| 88 #endif | 97 #endif | 
| 89 } | 98 } | 
| 90 | 99 | 
| 91 }  // namespace content | 100 }  // namespace content | 
| OLD | NEW | 
|---|