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

Side by Side Diff: content/app/content_main_runner.cc

Issue 2675163002: Add gpu_main_thread_factory.h to expose less of content's guts. (Closed)
Patch Set: Getter does not need exporting Created 3 years, 10 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 | « no previous file | content/browser/BUILD.gn » ('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_runner.h" 5 #include "content/public/app/content_main_runner.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdlib.h> 8 #include <stdlib.h>
9 #include <string.h> 9 #include <string.h>
10 10
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 #include "content/zygote/zygote_main.h" 106 #include "content/zygote/zygote_main.h"
107 #endif 107 #endif
108 108
109 #endif // OS_POSIX 109 #endif // OS_POSIX
110 110
111 #if defined(USE_NSS_CERTS) 111 #if defined(USE_NSS_CERTS)
112 #include "crypto/nss_util.h" 112 #include "crypto/nss_util.h"
113 #endif 113 #endif
114 114
115 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) 115 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
116 #include "content/browser/gpu/gpu_process_host.h" 116 #include "content/browser/gpu/gpu_main_thread_factory.h"
117 #endif 117 #endif
118 118
119 #if BUILDFLAG(ENABLE_PEPPER_CDMS) 119 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
120 #include "content/common/media/cdm_host_files.h" 120 #include "content/common/media/cdm_host_files.h"
121 #endif 121 #endif
122 122
123 namespace content { 123 namespace content {
124 extern int GpuMain(const content::MainFunctionParams&); 124 extern int GpuMain(const content::MainFunctionParams&);
125 #if BUILDFLAG(ENABLE_PLUGINS) 125 #if BUILDFLAG(ENABLE_PLUGINS)
126 #if !defined(OS_LINUX) 126 #if !defined(OS_LINUX)
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
369 return 1; 369 return 1;
370 } 370 }
371 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) 371 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
372 372
373 static void RegisterMainThreadFactories() { 373 static void RegisterMainThreadFactories() {
374 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD) 374 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) && !defined(CHROME_MULTIPLE_DLL_CHILD)
375 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( 375 UtilityProcessHostImpl::RegisterUtilityMainThreadFactory(
376 CreateInProcessUtilityThread); 376 CreateInProcessUtilityThread);
377 RenderProcessHostImpl::RegisterRendererMainThreadFactory( 377 RenderProcessHostImpl::RegisterRendererMainThreadFactory(
378 CreateInProcessRendererThread); 378 CreateInProcessRendererThread);
379 GpuProcessHost::RegisterGpuMainThreadFactory( 379 content::RegisterGpuMainThreadFactory(CreateInProcessGpuThread);
380 CreateInProcessGpuThread);
381 #else 380 #else
382 base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); 381 base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
383 if (command_line.HasSwitch(switches::kSingleProcess)) { 382 if (command_line.HasSwitch(switches::kSingleProcess)) {
384 LOG(FATAL) << 383 LOG(FATAL) <<
385 "--single-process is not supported in chrome multiple dll browser."; 384 "--single-process is not supported in chrome multiple dll browser.";
386 } 385 }
387 if (command_line.HasSwitch(switches::kInProcessGPU)) { 386 if (command_line.HasSwitch(switches::kInProcessGPU)) {
388 LOG(FATAL) << 387 LOG(FATAL) <<
389 "--in-process-gpu is not supported in chrome multiple dll browser."; 388 "--in-process-gpu is not supported in chrome multiple dll browser.";
390 } 389 }
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 872
874 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 873 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
875 }; 874 };
876 875
877 // static 876 // static
878 ContentMainRunner* ContentMainRunner::Create() { 877 ContentMainRunner* ContentMainRunner::Create() {
879 return new ContentMainRunnerImpl(); 878 return new ContentMainRunnerImpl();
880 } 879 }
881 880
882 } // namespace content 881 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698