ui/resources/ui_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: ui/resources/ui_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: ui/resources/ui_resources.gyp

diff --git a/ui/resources/ui_resources.gyp b/ui/resources/ui_resources.gyp

index 60a93dbd49db768ec9c1440670f836f7e16c819f..b285a0f54415ca7b0468555b877bde996b3d4427 100644

--- a/ui/resources/ui_resources.gyp

+++ b/ui/resources/ui_resources.gyp

@@ -71,7 +71,7 @@

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

}],

- ['enable_app_list==1', {

+ ['use_aura==1 and toolkit_views==1', {

'pak_inputs': [

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

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