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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 30833003: Add code to load Hangout Services as a component extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head for tryjobs. Created 7 years, 2 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 | « no previous file | chrome/browser/extensions/component_loader.h » ('j') | chrome/browser/extensions/component_loader.cc » ('J')
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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 <if expr="not is_android"> 124 <if expr="not is_android">
125 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" /> 125 <include name="IDR_EXTENSION_LIST_JS" file="resources\extensions\extensi on_list.js" flattenhtml="true" type="BINDATA" />
126 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_EXTENSION_INFO_CSS" file="resources\extensions\extens ion_info.css" flattenhtml="true" type="BINDATA" />
127 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" /> 127 <include name="IDR_EXTENSION_INFO_HTML" file="resources\extensions\exten sion_info.html" flattenhtml="true" type="BINDATA" />
128 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" /> 128 <include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extensi on_info.js" flattenhtml="true" type="BINDATA" />
129 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" /> 129 <include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions. js" flattenhtml="true" type="BINDATA" />
130 </if> 130 </if>
131 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" /> 131 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" />
132 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 132 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
133 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 133 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
134 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_serv ices\manifest.json" type="BINDATA" />
134 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 135 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
135 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ch ange_page.js" flattenhtml="true" type="BINDATA" /> 136 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ch ange_page.js" flattenhtml="true" type="BINDATA" />
136 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 137 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
137 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 138 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
138 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 139 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
139 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" /> 140 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" />
140 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 141 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
141 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" /> 142 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" />
142 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" /> 143 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" />
143 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 144 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 </if> 402 </if>
402 <if expr="pp_ifdef('chromeos')"> 403 <if expr="pp_ifdef('chromeos')">
403 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" /> 404 <include name="IDR_SOUND_STARTUP_WAV" file="resources\chromeos\sounds\st artup.wav" type="BINDATA" />
404 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" /> 405 <include name="IDR_SOUND_LOCK_WAV" file="resources\chromeos\sounds\lock. wav" type="BINDATA" />
405 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" /> 406 <include name="IDR_SOUND_UNLOCK_WAV" file="resources\chromeos\sounds\unl ock.wav" type="BINDATA" />
406 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" /> 407 <include name="IDR_SOUND_SHUTDOWN_WAV" file="resources\chromeos\sounds\s hutdown.wav" type="BINDATA" />
407 </if> 408 </if>
408 </includes> 409 </includes>
409 </release> 410 </release>
410 </grit> 411 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/component_loader.h » ('j') | chrome/browser/extensions/component_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698