content/content_plugin.gypi - 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/content_plugin.gypi

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/content_plugin.gypi

diff --git a/content/content_plugin.gypi b/content/content_plugin.gypi

index 921958033604b376076abc13cfc1843a7bb9c616..2b5352370f50ff7a243b9d53290a36bed502120f 100644

--- a/content/content_plugin.gypi

+++ b/content/content_plugin.gypi

@@ -4,7 +4,7 @@

{

'conditions': [

- ['enable_plugins==1', {

+ ['enable_plugins==1 and OS!="linux"', {

'dependencies': [

'../skia/skia.gyp:skia',

'../third_party/WebKit/public/blink.gyp:blink',

@@ -21,7 +21,6 @@

'plugin/plugin_interpose_util_mac.mm',

'plugin/plugin_interpose_util_mac.h',

'plugin/plugin_main.cc',

- 'plugin/plugin_main_linux.cc',

'plugin/plugin_main_mac.mm',

'plugin/plugin_thread.cc',

'plugin/plugin_thread.h',

@@ -36,21 +35,11 @@

# These are layered in conditionals in the event other platforms

# end up using this module as well.

'conditions': [

- ['os_bsd==1', {

- 'sources/': [

- ['exclude', '^plugin/plugin_main_linux\\.cc$'],

- ],

- }],

['OS=="win"', {

'include_dirs': [

'<(DEPTH)/third_party/wtl/include',

}],

- ['use_x11 == 1', {

- 'dependencies': [

- '../build/linux/system.gyp:xext',

- ],

- }],

}],

« no previous file with comments | « content/content_browsertests.isolate ('k') | content/content_shell.gypi » ('j') | no next file with comments »