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

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

index e319a372e34e92d275810017153aa4fca4790f7e..ec76c47eb16516ba5c0d8dcf1c1500fc6c9dd216 100644

--- a/content/content_shell.gypi

+++ b/content/content_shell.gypi

@@ -173,7 +173,6 @@

'shell/renderer/shell_render_process_observer.h',

'shell/renderer/shell_render_view_observer.cc',

'shell/renderer/shell_render_view_observer.h',

- 'shell/renderer/test_runner/key_code_mapping.cc',

'shell/renderer/test_runner/key_code_mapping.h',

'shell/renderer/test_runner/MockColorChooser.cpp',

'shell/renderer/test_runner/MockColorChooser.h',

@@ -558,11 +557,11 @@

'msvs_large_pdb': 1,

}], # OS=="win"

- ['OS == "win" or toolkit_uses_gtk == 1', {

+ ['OS == "win"', {

'dependencies': [

'../sandbox/sandbox.gyp:sandbox',

- }], # OS=="win" or toolkit_uses_gtk == 1

+ }], # OS=="win"

['OS=="mac"', {

'product_name': '<(content_shell_product_name)',

'dependencies!': [

« no previous file with comments | « content/content_plugin.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »