diff options
| author | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 18:25:58 +0000 |
|---|---|---|
| committer | piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-11 18:25:58 +0000 |
| commit | c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9 (patch) | |
| tree | e13ce03df198d9548851dd8e8aa02da3d6a978da /content/app | |
| parent | 54ba65aa8b7f842f125f704dfabb589559e9f60d (diff) | |
| download | chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.zip chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.tar.gz chromium_src-c997bc4b4403eb48f7ed1bb76a5392f4232bbdd9.tar.bz2 | |
Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux
BUG=297026
Review URL: https://codereview.chromium.org/234533002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263288 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/content_main_runner.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index 4ca6f30..2276f1a 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 }, |