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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7181002: Remove references to 'linux2' from our grd files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 6 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/resources/locale_settings.grd ('k') | no next file » | 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 <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/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
11 <includes> 11 <includes>
12 <if expr="os.find('win') != -1"> 12 <if expr="is_win">
tony 2011/06/15 23:22:51 This was accidentally matching 'darwin', but we do
13 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" type="BINDATA" /> 13 <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts .html" flattenhtml="true" type="BINDATA" />
14 </if> 14 </if>
15 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 15 <include name="IDR_ABOUT_FLASH_HTML" file="resources\about_flash.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
16 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" /> 16 <include name="IDR_ABOUT_FLASH_JS" file="resources\about_flash.js" type="B INDATA" />
17 <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'"> 17 <if expr="is_posix and not is_macosx">
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="is_macosx">
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 and o s != 'sunos5'"> 23 <if expr="is_win">
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_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" />
28 <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" />
29 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" type="BINDATA" /> 29 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" type="BINDATA" />
30 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 30 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
31 <include name="IDR_DOWNLOADS_JS" file="resources\downloads.js" type="BINDA TA" /> 31 <include name="IDR_DOWNLOADS_JS" file="resources\downloads.js" type="BINDA TA" />
32 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" /> 32 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" allowexternalscript="true" type="BINDATA" />
33 <if expr="os == 'darwin'"> 33 <if expr="is_macosx">
34 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 34 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
35 </if> 35 </if>
36 <if expr="os != 'darwin'"> 36 <if expr="not is_macosx">
37 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 37 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
38 </if> 38 </if>
39 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />
40 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 40 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
41 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
42 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 42 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
43 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" /> 43 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" />
44 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" /> 44 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />
45 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 45 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
46 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" /> 46 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <!-- Enterprise enrollment dialog --> 117 <!-- Enterprise enrollment dialog -->
118 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" /> 118 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 119 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
120 </if> 120 </if>
121 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 121 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
122 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 122 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
123 </if> 123 </if>
124 </includes> 124 </includes>
125 </release> 125 </release>
126 </grit> 126 </grit>
OLDNEW
« chrome/app/generated_resources.grd ('K') | « chrome/app/resources/locale_settings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698