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

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

Issue 1856963002: Remove content/public/plugin and chrome/plugin (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_03_content_child_npapi
Patch Set: rebase Created 4 years, 8 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
« no previous file with comments | « content/public/app/content_main_delegate.h ('k') | content/public/common/content_client.h » ('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 "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "content/public/gpu/content_gpu_client.h" 9 #include "content/public/gpu/content_gpu_client.h"
10 #include "content/public/plugin/content_plugin_client.h"
11 #include "content/public/renderer/content_renderer_client.h" 10 #include "content/public/renderer/content_renderer_client.h"
12 #include "content/public/utility/content_utility_client.h" 11 #include "content/public/utility/content_utility_client.h"
13 12
14 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 13 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
15 #include "content/public/browser/content_browser_client.h" 14 #include "content/public/browser/content_browser_client.h"
16 #endif 15 #endif
17 16
18 namespace content { 17 namespace content {
19 18
20 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) { 19 bool ContentMainDelegate::BasicStartupComplete(int* exit_code) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 } 63 }
65 64
66 ContentGpuClient* ContentMainDelegate::CreateContentGpuClient() { 65 ContentGpuClient* ContentMainDelegate::CreateContentGpuClient() {
67 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 66 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
68 return NULL; 67 return NULL;
69 #else 68 #else
70 return new ContentGpuClient(); 69 return new ContentGpuClient();
71 #endif 70 #endif
72 } 71 }
73 72
74 ContentPluginClient* ContentMainDelegate::CreateContentPluginClient() {
75 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
76 return NULL;
77 #else
78 return new ContentPluginClient();
79 #endif
80 }
81
82 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() { 73 ContentRendererClient* ContentMainDelegate::CreateContentRendererClient() {
83 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 74 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
84 return NULL; 75 return NULL;
85 #else 76 #else
86 return new ContentRendererClient(); 77 return new ContentRendererClient();
87 #endif 78 #endif
88 } 79 }
89 80
90 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() { 81 ContentUtilityClient* ContentMainDelegate::CreateContentUtilityClient() {
91 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 82 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
92 return NULL; 83 return NULL;
93 #else 84 #else
94 return new ContentUtilityClient(); 85 return new ContentUtilityClient();
95 #endif 86 #endif
96 } 87 }
97 88
98 } // namespace content 89 } // namespace content
OLDNEW
« no previous file with comments | « content/public/app/content_main_delegate.h ('k') | content/public/common/content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698