chrome/app/theme/theme_resources_large.grd - Issue 7906022: Merge theme_resources_large and theme_resources_standard targets

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/app/theme/theme_resources_large.grd

Issue 7906022: Merge theme_resources_large and theme_resources_standard targets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/theme_resources_large.h" type="rc_header">	4 <output filename="grit/theme_resources_large.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/theme_resources_large_map.cc" type="resource_map_sour ce" />

8 <output filename="grit/theme_resources_large_map.h" type="resource_map_heade r" />

9 <output filename="theme_resources_large.pak" type="data_package" />	7 <output filename="theme_resources_large.pak" type="data_package" />

10 <output filename="theme_resources_large.rc" type="rc_all" />

11 </outputs>	8 </outputs>

12 <release seq="1">	9 <release seq="1">

13 <includes>	10 <includes>

14 <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH	11 <!-- KEEP THESE IN ALPHABETICAL ORDER AND SYNCHRONIZED WITH

15 theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE	12 theme_resources_standard.grd. THIS MEANS THAT EACH ICON IN THIS FILE

16 MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->	13 MUST HAVE AN EQUIVALENT ICON IN THE OTHER FILE.-->

17 <include name="IDR_BACK" file="large_back.png" type="BINDATA" />	14 <include name="IDR_BACK" file="large_back.png" type="BINDATA" />

18 <include name="IDR_BACK_D" file="large_back_d.png" type="BINDATA" />	15 <include name="IDR_BACK_D" file="large_back_d.png" type="BINDATA" />

19 <include name="IDR_BACK_H" file="large_back_h.png" type="BINDATA" />	16 <include name="IDR_BACK_H" file="large_back_h.png" type="BINDATA" />

20 <include name="IDR_BACK_P" file="large_back_p.png" type="BINDATA" />	17 <include name="IDR_BACK_P" file="large_back_p.png" type="BINDATA" />

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 <if expr="is_macosx">	149 <if expr="is_macosx">

153 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="large_theme_toolbar_def ault_inactive2.png" type="BINDATA" />	150 <include name="IDR_THEME_TOOLBAR_INACTIVE" file="large_theme_toolbar_def ault_inactive2.png" type="BINDATA" />

154 </if>	151 </if>

155 <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" typ e="BINDATA" />	152 <include name="IDR_THROBBER_WAITING" file="large_throbber_waiting.png" typ e="BINDATA" />

156 <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />	153 <include name="IDR_TOOLS" file="large_tools.png" type="BINDATA" />

157 <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />	154 <include name="IDR_TOOLS_H" file="large_tools_h.png" type="BINDATA" />

158 <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />	155 <include name="IDR_TOOLS_P" file="large_tools_p.png" type="BINDATA" />

159 </includes>	156 </includes>

160 </release>	157 </release>

161 </grit>	158 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »