ui/resources/ui_resources.grd - Issue 110283005: Make aura_demo work on Mac

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.grd

Issue 110283005: Make aura_demo work on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix resolve Created 6 years, 11 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: ui/resources/ui_resources.grd

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

index 8fd038e060a92c12ed726047f1ec01b75e697248..f6c77e661c0bc3eb0ca260e50fb55d6c867542e9 100644

--- a/ui/resources/ui_resources.grd

+++ b/ui/resources/ui_resources.grd

@@ -306,7 +306,7 @@

</if>

- <if expr="is_macosx or is_ios">

+ <if expr="(is_macosx or is_ios) and not pp_ifdef('toolkit_views')">

</if>

« no previous file with comments | « ui/gfx/screen_mac.mm ('k') | ui/ui.gyp » ('j') | no next file with comments »