Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: content/public/app/content_main_delegate.cc

Issue 17619005: Create top-level separate targets for browser and child dlls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/content_common.gypi ('k') | ui/keyboard/keyboard.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 30 matching lines...) Expand all
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 ZygoteForkDelegate* ContentMainDelegate::ZygoteStarting() {
46 return NULL; 46 return NULL;
47 } 47 }
48 48
49 #endif 49 #endif
50 50
51 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() { 51 #if !defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_CHILD)
52 return new ContentBrowserClient(); 52
53 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
54 #if defined(OS_IOS)
55 return NULL;
56 #else
57 return new ContentRendererClient();
58 #endif
53 } 59 }
54 60
55 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() { 61 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
56 #if defined(OS_IOS) 62 #if defined(OS_IOS)
57 return NULL; 63 return NULL;
58 #else 64 #else
59 return new ContentPluginClient(); 65 return new ContentPluginClient();
60 #endif 66 #endif
61 } 67 }
62 68
63 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { 69 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
64 #if defined(OS_IOS)
65 return NULL; 70 return NULL;
66 #else
67 return new ContentRendererClient();
68 #endif
69 } 71 }
70 72
71 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { 73 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
72 #if defined(OS_IOS) 74 #if defined(OS_IOS)
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
81 #else // In browser in multiple DLL mode.
82
83 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
84 return NULL;
85 }
86
87 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
88 return NULL;
89 }
90 ContentBrowserClient* ContentMainDelegate::CreateContentBrowserClient() {
91 return new ContentBrowserClient();
92 }
93
94 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
95 return NULL;
96 }
97
98 #endif
99
100
79 } // namespace content 101 } // namespace content
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | ui/keyboard/keyboard.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698