content/browser/devtools/devtools.gyp - Issue 2100883002: DevTools: merge browser_protocol.json files from content and core/inspector.

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/browser/devtools/devtools.gyp

Issue 2100883002: DevTools: merge browser_protocol.json files from content and core/inspector. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gn fix Created 4 years, 5 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

« no previous file with comments | « content/browser/devtools/browser_protocol.json ('k') | content/browser/devtools/protocol/devtools_protocol_handler_generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/devtools.gyp

diff --git a/content/browser/devtools/devtools.gyp b/content/browser/devtools/devtools.gyp

index 33c99b1e0a855bd8772425310651e748881842d2..fc1a8a41978ce8a200ff2584debed32e424f70fd 100644

--- a/content/browser/devtools/devtools.gyp

+++ b/content/browser/devtools/devtools.gyp

@@ -15,14 +15,12 @@

'action_name': 'devtools_protocol_handler',

'variables': {

'blink_protocol': '<(SHARED_INTERMEDIATE_DIR)/blink/core/inspector/protocol.json',

- 'browser_protocol': 'browser_protocol.json',

'generator': 'protocol/devtools_protocol_handler_generator.py',

'output_cc': '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc',

'output_h': '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h',

'inputs': [

'<(blink_protocol)',

- '<(browser_protocol)',

'<(generator)',

'outputs': [

@@ -33,11 +31,10 @@

'python',

'<(generator)',

'<(blink_protocol)',

- '<(browser_protocol)',

'<(output_cc)',

'<(output_h)',

- 'message': 'Generating DevTools protocol browser-side handlers from <(blink_protocol) and <(browser_protocol)'

+ 'message': 'Generating DevTools protocol browser-side handlers from <(blink_protocol)'

'direct_dependent_settings': {