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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 101463005: Inline devtools_discovery_page_resources.grd into browser_resources.grd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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
« chrome/browser/android/dev_tools_server.cc ('K') | « chrome/browser/android/dev_tools_server.cc ('k') | chrome/browser/devtools/browser_list_tabcontents_provider.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 <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">
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 <if expr="pp_ifdef('enable_app_list')"> 105 <if expr="pp_ifdef('enable_app_list')">
106 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" /> 106 <include name="IDR_CHROME_APP_MANIFEST" file="resources\chrome_app\manif est.json" type="BINDATA" />
107 </if> 107 </if>
108 <if expr="pp_ifdef('enable_printing')"> 108 <if expr="pp_ifdef('enable_printing')">
109 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" /> 109 <include name="IDR_CLOUDPRINT_MANIFEST" file="resources\cloud_print_app\ manifest.json" type="BINDATA" />
110 </if> 110 </if>
111 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 111 <include name="IDR_CRASHES_HTML" file="resources\crashes.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
112 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" /> 112 <include name="IDR_CRASHES_JS" file="resources\crashes.js" type="BINDATA" />
113 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" /> 113 <include name="IDR_CREDITS_HTML" file="${about_credits_file}" use_base_dir ="false" type="BINDATA" />
114 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" /> 114 <include name="IDR_CREDITS_JS" file="resources\about_credits.js" type="BIN DATA" />
115 <if expr="not is_ios">
116 <include name="IDR_DEVTOOLS_DISCOVERY_PAGE_HTML" file="devtools\frontend \devtools_discovery_page.html" type="BINDATA"/>
117 </if>
115 <if expr="not is_android"> 118 <if expr="not is_android">
116 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" type="BINDATA" /> 119 <include name="IDR_DOWNLOADS_JS" file="resources\downloads\downloads.js" type="BINDATA" />
117 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" /> 120 <include name="IDR_EXTENSION_COMMAND_LIST_JS" file="resources\extensions \extension_command_list.js" flattenhtml="true" type="BINDATA" />
118 </if> 121 </if>
119 <if expr="is_macosx"> 122 <if expr="is_macosx">
120 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 123 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
121 </if> 124 </if>
122 <if expr="not is_macosx"> 125 <if expr="not is_macosx">
123 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
124 </if> 127 </if>
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
413 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 416 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
414 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 417 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
415 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 418 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
416 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" /> 419 <include name="IDR_SOUND_SPOKEN_FEEDBACK_ENABLED_WAV" file="resources\ch romeos\sounds\spoken_feedback_enabled.wav" type="BINDATA" />
417 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" /> 420 <include name="IDR_SOUND_SPOKEN_FEEDBACK_DISABLED_WAV" file="resources\c hromeos\sounds\spoken_feedback_disabled.wav" type="BINDATA" />
418 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" /> 421 <include name="IDR_SOUND_VOLUME_ADJUST_WAV" file="resources\chromeos\sou nds\volume_adjust.wav" type="BINDATA" />
419 </if> 422 </if>
420 </includes> 423 </includes>
421 </release> 424 </release>
422 </grit> 425 </grit>
OLDNEW
« chrome/browser/android/dev_tools_server.cc ('K') | « chrome/browser/android/dev_tools_server.cc ('k') | chrome/browser/devtools/browser_list_tabcontents_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698