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

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

Issue 14882004: Revert 198834 "Add chrome_split_dll gyp variable, and duplicate ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « trunk/src/content/content.gyp ('k') | no next file » | 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll. 64 #if defined(OS_IOS)
65 #if defined(OS_IOS) || defined(CHROME_SPLIT_DLL)
66 return NULL; 65 return NULL;
67 #else 66 #else
68 return new ContentRendererClient(); 67 return new ContentRendererClient();
69 #endif 68 #endif
70 } 69 }
71 70
72 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { 71 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
73 // TODO(scottmg): http://crbug.com/237249 Need split for chrome_child.dll. 72 #if defined(OS_IOS)
74 #if defined(OS_IOS) || defined(CHROME_SPLIT_DLL)
75 return NULL; 73 return NULL;
76 #else 74 #else
77 return new ContentUtilityClient(); 75 return new ContentUtilityClient();
78 #endif 76 #endif
79 } 77 }
80 78
81 } // namespace content 79 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/content.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698