athena/resources/athena_resources.gyp - Issue 514583002: Use SearchProvider for Athena

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: athena/resources/athena_resources.gyp

Issue 514583002: Use SearchProvider for Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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: athena/resources/athena_resources.gyp

diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp

index 15f05fd5c3f6f6c3801d499e0019ead4b144988a..a4511b597d585056dca7757fea31e22cf62e5066 100644

--- a/athena/resources/athena_resources.gyp

+++ b/athena/resources/athena_resources.gyp

@@ -29,6 +29,8 @@

'type': 'none',

'dependencies': [

'../../ash/ash_resources.gyp:ash_resources',

+ '../../components/components_resources.gyp:components_resources',

+ '../../components/components_strings.gyp:components_strings',

'../../content/app/resources/content_resources.gyp:content_resources',

'../../content/app/strings/content_strings.gyp:content_strings',

'../../extensions/extensions.gyp:extensions_shell_and_test_pak',

@@ -43,6 +45,9 @@

'<(PRODUCT_DIR)/extensions_shell_and_test.pak',

'<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',

'<(SHARED_INTERMEDIATE_DIR)/content/app/strings/content_strings_en-US.pak',

'<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak',