Source/WebKit/chromium/features.gypi - Issue 12382019: Merge 143917

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: Source/WebKit/chromium/features.gypi

Issue 12382019: Merge 143917 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 10 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:

Index: Source/WebKit/chromium/features.gypi

===================================================================

--- Source/WebKit/chromium/features.gypi (revision 144320)

+++ Source/WebKit/chromium/features.gypi (working copy)

@@ -94,7 +94,6 @@

'ENABLE_MHTML=1',

'ENABLE_MICRODATA=0',

'ENABLE_MOUSE_CURSOR_SCALE=1',

- 'ENABLE_NAVIGATOR_CONTENT_UTILS=1',

'ENABLE_NOSNIFF=1',

'ENABLE_PAGE_VISIBILITY_API=1',

'ENABLE_PERFORMANCE_TIMELINE=1',

@@ -175,7 +174,7 @@

'ENABLE_ORIENTATION_EVENTS=1',

'ENABLE_PAGE_POPUP=0',

'ENABLE_PRINTING=0',

- 'ENABLE_REGISTER_PROTOCOL_HANDLER=0',

+ 'ENABLE_NAVIGATOR_CONTENT_UTILS=0',

# FIXME: Disable once the linking error has been resolved.

# https://bugs.webkit.org/show_bug.cgi?id=88636

'ENABLE_SHARED_WORKERS=1',

@@ -193,6 +192,7 @@

'ENABLE_INPUT_MULTIPLE_FIELDS_UI=1',

'ENABLE_LEGACY_NOTIFICATIONS=1',

'ENABLE_MEDIA_CAPTURE=0',

+ 'ENABLE_NAVIGATOR_CONTENT_UTILS=1',

'ENABLE_NOTIFICATIONS=1',

'ENABLE_ORIENTATION_EVENTS=0',

'ENABLE_PAGE_POPUP=1',

« no previous file with comments | « no previous file | Source/WebKit/chromium/src/ChromeClientImpl.h » ('j') | no next file with comments »