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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 | 54 |
55 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { | 55 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { |
56 #if defined(OS_IOS) | 56 #if defined(OS_IOS) |
57 return NULL; | 57 return NULL; |
58 #else | 58 #else |
59 return new ContentPluginClient(); | 59 return new ContentPluginClient(); |
60 #endif | 60 #endif |
61 } | 61 } |
62 | 62 |
63 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { | 63 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { |
64 #if defined(OS_IOS) | 64 // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll. |
| 65 #if defined(OS_IOS) || defined(CHROME_SPLIT_DLL) |
65 return NULL; | 66 return NULL; |
66 #else | 67 #else |
67 return new ContentRendererClient(); | 68 return new ContentRendererClient(); |
68 #endif | 69 #endif |
69 } | 70 } |
70 | 71 |
71 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { | 72 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { |
72 #if defined(OS_IOS) | 73 // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll. |
| 74 #if defined(OS_IOS) || defined(CHROME_SPLIT_DLL) |
73 return NULL; | 75 return NULL; |
74 #else | 76 #else |
75 return new ContentUtilityClient(); | 77 return new ContentUtilityClient(); |
76 #endif | 78 #endif |
77 } | 79 } |
78 | 80 |
79 } // namespace content | 81 } // namespace content |
OLD | NEW |