Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 6299002: [Sync] Port about:sync to DOMUI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added workaround for bug 69633 Created 9 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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/dom_ui/dom_ui_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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. etaa --> 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>
14 <if expr="os.find('win') != -1"> 14 <if expr="os.find('win') != -1">
15 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" type="BINDATA" /> 15 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" type="BINDATA" />
16 </if> 16 </if>
17 <if expr="os == 'linux2' or os.find('bsd') != -1"> 17 <if expr="os == 'linux2' or os.find('bsd') != -1">
18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" /> 18 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux .html" flattenhtml="true" type="BINDATA" />
19 </if> 19 </if>
20 <if expr="os == 'darwin'"> 20 <if expr="os == 'darwin'">
21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" /> 21 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.h tml" flattenhtml="true" type="BINDATA" />
22 </if> 22 </if>
23 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1"> 23 <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1">
24 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" /> 24 <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />
25 </if> 25 </if>
26 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" type="BINDATA" /> 26 <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" fla ttenhtml="true" type="BINDATA" />
27 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />
28 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" /> 27 <include name="IDR_ABOUT_VERSION_HTML" file="resources\about_version.html" flattenhtml="true" type="BINDATA" />
29 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 28 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
30 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 29 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
31 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" /> 30 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" />
32 <if expr="os == 'darwin'"> 31 <if expr="os == 'darwin'">
33 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 32 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
34 </if> 33 </if>
35 <if expr="os != 'darwin'"> 34 <if expr="os != 'darwin'">
36 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 35 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
37 </if> 36 </if>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt enhtml="true" type="BINDATA" /> 97 <include name="IDR_SLIDESHOW_HTML" file="resources\slideshow.html" flatt enhtml="true" type="BINDATA" />
99 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" /> 98 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />
100 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" /> 99 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />
101 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" /> 100 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />
102 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" /> 101 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />
103 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" /> 102 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />
104 </if> 103 </if>
105 </includes> 104 </includes>
106 </release> 105 </release>
107 </grit> 106 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/dom_ui/dom_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698