chrome/app/theme/theme_resources.grd - Issue 247623004: Merge 264110 "linux_aura: Remove the 'a' badge."

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/app/theme/theme_resources.grd

Issue 247623004: Merge 264110 "linux_aura: Remove the 'a' badge." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1916/src/

Patch Set: Created 6 years, 8 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/app/theme/theme_resources.grd

===================================================================

--- chrome/app/theme/theme_resources.grd (revision 265336)

+++ chrome/app/theme/theme_resources.grd (working copy)

@@ -1238,14 +1238,8 @@

</if>

- <if expr="toolkit_views or is_macosx or is_ios">

- <if expr="desktop_linux">

- <structure type="chrome_scaled_image" name="IDR_TOOLS_BADGE_AURA" file="common/browser_tools_badge_aura.png" />

- <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal_aura.png" />

- </if>

- <if expr="not desktop_linux">

- <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />

- </if>

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

+ <structure type="chrome_scaled_image" name="IDR_TOOLS" file="common/browser_tools_normal.png" />

</if>