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

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

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/accessibility/accessibility_tree_formatter.cc » ('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 <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include "base/allocator/allocator_extension.h" 9 #include "base/allocator/allocator_extension.h"
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC) 100 #if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
101 extern "C" { 101 extern "C" {
102 int tc_set_new_mode(int mode); 102 int tc_set_new_mode(int mode);
103 } 103 }
104 #endif 104 #endif
105 105
106 namespace content { 106 namespace content {
107 extern int GpuMain(const content::MainFunctionParams&); 107 extern int GpuMain(const content::MainFunctionParams&);
108 #if defined(ENABLE_PLUGINS) 108 #if defined(ENABLE_PLUGINS)
109 #if !defined(OS_LINUX)
109 extern int PluginMain(const content::MainFunctionParams&); 110 extern int PluginMain(const content::MainFunctionParams&);
111 #endif
110 extern int PpapiPluginMain(const MainFunctionParams&); 112 extern int PpapiPluginMain(const MainFunctionParams&);
111 extern int PpapiBrokerMain(const MainFunctionParams&); 113 extern int PpapiBrokerMain(const MainFunctionParams&);
112 #endif 114 #endif
113 extern int RendererMain(const content::MainFunctionParams&); 115 extern int RendererMain(const content::MainFunctionParams&);
114 extern int UtilityMain(const MainFunctionParams&); 116 extern int UtilityMain(const MainFunctionParams&);
115 extern int WorkerMain(const MainFunctionParams&); 117 extern int WorkerMain(const MainFunctionParams&);
116 } // namespace content 118 } // namespace content
117 119
118 namespace { 120 namespace {
119 #if defined(OS_WIN) 121 #if defined(OS_WIN)
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 int RunNamedProcessTypeMain( 428 int RunNamedProcessTypeMain(
427 const std::string& process_type, 429 const std::string& process_type,
428 const MainFunctionParams& main_function_params, 430 const MainFunctionParams& main_function_params,
429 ContentMainDelegate* delegate) { 431 ContentMainDelegate* delegate) {
430 static const MainFunction kMainFunctions[] = { 432 static const MainFunction kMainFunctions[] = {
431 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 433 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
432 { "", BrowserMain }, 434 { "", BrowserMain },
433 #endif 435 #endif
434 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 436 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
435 #if defined(ENABLE_PLUGINS) 437 #if defined(ENABLE_PLUGINS)
438 #if !defined(OS_LINUX)
436 { switches::kPluginProcess, PluginMain }, 439 { switches::kPluginProcess, PluginMain },
440 #endif
437 { switches::kWorkerProcess, WorkerMain }, 441 { switches::kWorkerProcess, WorkerMain },
438 { switches::kPpapiPluginProcess, PpapiPluginMain }, 442 { switches::kPpapiPluginProcess, PpapiPluginMain },
439 { switches::kPpapiBrokerProcess, PpapiBrokerMain }, 443 { switches::kPpapiBrokerProcess, PpapiBrokerMain },
440 #endif // ENABLE_PLUGINS 444 #endif // ENABLE_PLUGINS
441 { switches::kUtilityProcess, UtilityMain }, 445 { switches::kUtilityProcess, UtilityMain },
442 { switches::kRendererProcess, RendererMain }, 446 { switches::kRendererProcess, RendererMain },
443 { switches::kGpuProcess, GpuMain }, 447 { switches::kGpuProcess, GpuMain },
444 #endif // !CHROME_MULTIPLE_DLL_BROWSER 448 #endif // !CHROME_MULTIPLE_DLL_BROWSER
445 }; 449 };
446 450
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 860
857 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl); 861 DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
858 }; 862 };
859 863
860 // static 864 // static
861 ContentMainRunner* ContentMainRunner::Create() { 865 ContentMainRunner* ContentMainRunner::Create() {
862 return new ContentMainRunnerImpl(); 866 return new ContentMainRunnerImpl();
863 } 867 }
864 868
865 } // namespace content 869 } // namespace content
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/accessibility/accessibility_tree_formatter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698