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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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 side-by-side diff with in-line comments

Download patch

Index: content/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 4ca6f30b509295bb406d9e42484d69332623e279..2276f1a784a8947a352f119822d9bcd553f6c0ba 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -106,7 +106,9 @@ int tc_set_new_mode(int mode);

namespace content {

extern int GpuMain(const content::MainFunctionParams&);

#if defined(ENABLE_PLUGINS)

+#if !defined(OS_LINUX)

extern int PluginMain(const content::MainFunctionParams&);

+#endif

extern int PpapiPluginMain(const MainFunctionParams&);

extern int PpapiBrokerMain(const MainFunctionParams&);

#endif

@@ -433,7 +435,9 @@ int RunNamedProcessTypeMain(

#endif

#if !defined(CHROME_MULTIPLE_DLL_BROWSER)

#if defined(ENABLE_PLUGINS)

+#if !defined(OS_LINUX)

{ switches::kPluginProcess, PluginMain },

+#endif

{ switches::kWorkerProcess, WorkerMain },

{ switches::kPpapiPluginProcess, PpapiPluginMain },

{ switches::kPpapiBrokerProcess, PpapiBrokerMain },

« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/browser/accessibility/accessibility_tree_formatter.cc » ('j') | no next file with comments »