ash/ash_resources.gyp - Issue 1934213002: Set enable_app_list=1 now only on ChromeOS.

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: ash/ash_resources.gyp

Issue 1934213002: Set enable_app_list=1 now only on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@20160429-AppList0

Patch Set: Update ui_test_pak - should fix tests Created 4 years, 7 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: ash/ash_resources.gyp

diff --git a/ash/ash_resources.gyp b/ash/ash_resources.gyp

index 199d6a167567f9f6b334184d84a137f3eae2cacb..cae3d14f98832ef768270ba7636e8987a54274ab 100644

--- a/ash/ash_resources.gyp

+++ b/ash/ash_resources.gyp

@@ -53,12 +53,8 @@

'pak_inputs': [

# TODO(msw): This seems bad, but follows repack_ui_test_pack's example.

'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',

- '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak',

- ],

- }],

- ['enable_app_list==1', {

- 'pak_inputs': [

'<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_100_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_100_percent.pak',

}],

@@ -107,12 +103,8 @@

}],

['toolkit_views==1', {

'pak_inputs': [

- '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_200_percent.pak',

- ],

- }],

- ['enable_app_list==1', {

- 'pak_inputs': [

'<(SHARED_INTERMEDIATE_DIR)/ui/app_list/resources/app_list_resources_200_percent.pak',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/views/resources/views_resources_200_percent.pak',

}],

« no previous file with comments | « BUILD.gn ('k') | ash/resources/BUILD.gn » ('j') | no next file with comments »