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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 12335051: Merge 182894 - 3rd attempt (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/
Patch Set: Created 7 years, 10 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/chromeos/login/login_utils.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 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / > 271 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\chromeos\keybo ard_overlay.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" / >
272 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" /> 272 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" />
273 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" /> 273 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" />
274 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" /> 274 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" />
275 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" /> 275 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" />
276 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" /> 276 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" />
277 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" /> 277 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" />
278 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" /> 278 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" />
279 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" /> 279 <include name="IDR_ECHO_MANIFEST" file="resources\chromeos\echo\manifest .json" type="BINDATA" />
280 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" /> 280 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" />
281 <include name="IDR_MERGE_SESSION_LOAD_HTML" file="resources\chromeos\mer ge_session_load.html" flattenhtml="true" type="BINDATA" />
281 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> 282 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" />
282 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 283 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
283 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 284 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
284 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" /> 285 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" />
285 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" /> 286 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" />
286 </if> 287 </if>
287 <if expr="pp_ifdef('file_manager_extension')"> 288 <if expr="pp_ifdef('file_manager_extension')">
288 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 289 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
289 <include name="IDR_FILEMANAGER_MANIFEST_V1" file="resources\file_manager \manifest_v1.json" type="BINDATA" /> 290 <include name="IDR_FILEMANAGER_MANIFEST_V1" file="resources\file_manager \manifest_v1.json" type="BINDATA" />
290 </if> 291 </if>
(...skipping 13 matching lines...) Expand all
304 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" /> 305 <include name="IDR_GESTURE_CONFIG_JS" file="resources\gesture_config.js" type="BINDATA" />
305 </if> 306 </if>
306 <if expr="is_win"> 307 <if expr="is_win">
307 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" /> 308 <include name="IDR_SET_AS_DEFAULT_BROWSER_JS" file="resources\set_as_def ault_browser.js" flattenhtml="true" type="BINDATA" />
308 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " /> 309 <include name="IDR_SET_AS_DEFAULT_BROWSER_HTML" file="resources\set_as_d efault_browser.html" flattenhtml="true" allowexternalscript="true" type="BINDATA " />
309 </if> 310 </if>
310 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" /> 311 <include name="IDR_MANAGED_MODE_BLOCK_INTERSTITIAL_HTML" file="resources\m anaged_mode_block_interstitial.html" flattenhtml="true" type="BINDATA" />
311 </includes> 312 </includes>
312 </release> 313 </release>
313 </grit> 314 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/login_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698