chrome/chrome_resources.gyp - Issue 1316043003: Add chrome://site-engagement WebUI.

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: chrome/chrome_resources.gyp

Issue 1316043003: Add chrome://site-engagement WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@navigation_smarter

Patch Set: namespace Created 5 years, 3 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: chrome/chrome_resources.gyp

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp

index 7ceb20835e87a50917139a4eb1321ab7adc734fa..ecf34d068aa644fc8e1c70ccd7c5d73b3e539668 100644

--- a/chrome/chrome_resources.gyp

+++ b/chrome/chrome_resources.gyp

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

'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',

'about_credits_file': '<(SHARED_INTERMEDIATE_DIR)/about_credits.html',

'additional_modules_list_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/internal/additional_modules_list.txt',

- 'omnibox_mojom_file': '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/ui/webui/omnibox/omnibox.mojom.js',

'targets': [

{

@@ -202,7 +201,7 @@

'grit_additional_defines': [

'-E', 'about_credits_file=<(about_credits_file)',

'-E', 'additional_modules_list_file=<(additional_modules_list_file)',

- '-E', 'omnibox_mojom_file=<(omnibox_mojom_file)',

sky 2015/09/10 17:22:24 How is the omnibox.mojom.js file picked up after y

calamity 2015/09/11 07:48:24 The change in browser_resources.grd specifies the

+ '-E', 'root_gen_dir=<(SHARED_INTERMEDIATE_DIR)',

'includes': [ '../build/grit_action.gypi' ],