chrome/browser/browser_resources.grd - Issue 4715001: Merge 65401 - A bunch of proxy DOMUI changes....

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/browser/browser_resources.grd

Issue 4715001: Merge 65401 - A bunch of proxy DOMUI changes.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/552c/src/

Patch Set: Created 10 years, 1 month 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 <!-- This comment is only here because changes to resources are not picked up	2 <!-- This comment is only here because changes to resources are not picked up

3 without changes to the corresponding grd file. et -->	3 without changes to the corresponding grd file. etaa -->

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

5 <outputs>	5 <outputs>

6 <output filename="grit/browser_resources.h" type="rc_header">	6 <output filename="grit/browser_resources.h" type="rc_header">

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

8 </output>	8 </output>

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

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

11 </outputs>	11 </outputs>

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

13 <includes>	13 <includes>

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" />	80 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" />

81 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />	81 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />

82 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />	82 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />

83 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />	83 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />

84 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />	84 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />

85 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />	85 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />

86 </if>	86 </if>

87 </includes>	87 </includes>

88 </release>	88 </release>

89 </grit>	89 </grit>

OLD	NEW

« no previous file with comments | « no previous file | chrome/browser/chromeos/cros_settings_provider_proxy.h » ('j') | no next file with comments »