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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1901853002: Import supervised user dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@md-user-manager-confirmation-page
Patch Set: Addressed comments + rebase Created 4 years, 8 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_user_manager/compiled_resources2.gyp » ('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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 <include name="IDR_USER_MANAGER_JS" file="resources\user_manager\user_ma nager.js" flattenhtml="true" type="BINDATA" /> 399 <include name="IDR_USER_MANAGER_JS" file="resources\user_manager\user_ma nager.js" flattenhtml="true" type="BINDATA" />
400 <include name="IDR_USER_MANAGER_HTML" file="resources\user_manager\user_ manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 400 <include name="IDR_USER_MANAGER_HTML" file="resources\user_manager\user_ manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
401 </if> 401 </if>
402 <if expr="not is_android and not is_ios and not chromeos"> 402 <if expr="not is_android and not is_ios and not chromeos">
403 <include name="IDR_MD_CONTROL_BAR_CSS" file="resources\md_user_manager\c ontrol_bar.css" flattenhtml="true" type="BINDATA" /> 403 <include name="IDR_MD_CONTROL_BAR_CSS" file="resources\md_user_manager\c ontrol_bar.css" flattenhtml="true" type="BINDATA" />
404 <include name="IDR_MD_CONTROL_BAR_HTML" file="resources\md_user_manager\ control_bar.html" flattenhtml="true" type="BINDATA" /> 404 <include name="IDR_MD_CONTROL_BAR_HTML" file="resources\md_user_manager\ control_bar.html" flattenhtml="true" type="BINDATA" />
405 <include name="IDR_MD_CONTROL_BAR_JS" file="resources\md_user_manager\co ntrol_bar.js" type="BINDATA" /> 405 <include name="IDR_MD_CONTROL_BAR_JS" file="resources\md_user_manager\co ntrol_bar.js" type="BINDATA" />
406 <include name="IDR_MD_CREATE_PROFILE_CSS" file="resources\md_user_manage r\create_profile.css" flattenhtml="true" type="BINDATA" /> 406 <include name="IDR_MD_CREATE_PROFILE_CSS" file="resources\md_user_manage r\create_profile.css" flattenhtml="true" type="BINDATA" />
407 <include name="IDR_MD_CREATE_PROFILE_HTML" file="resources\md_user_manag er\create_profile.html" flattenhtml="true" type="BINDATA" /> 407 <include name="IDR_MD_CREATE_PROFILE_HTML" file="resources\md_user_manag er\create_profile.html" flattenhtml="true" type="BINDATA" />
408 <include name="IDR_MD_CREATE_PROFILE_JS" file="resources\md_user_manager \create_profile.js" type="BINDATA" /> 408 <include name="IDR_MD_CREATE_PROFILE_JS" file="resources\md_user_manager \create_profile.js" type="BINDATA" />
409 <include name="IDR_MD_IMPORT_SUPERVISED_USER_HTML" file="resources\md_us er_manager\import_supervised_user.html" flattenhtml="true" type="BINDATA" />
410 <include name="IDR_MD_IMPORT_SUPERVISED_USER_JS" file="resources\md_user _manager\import_supervised_user.js" type="BINDATA" />
409 <include name="IDR_MD_PROFILE_BROWSER_PROXY_HTML" file="resources\md_use r_manager\profile_browser_proxy.html" flattenhtml="true" type="BINDATA" /> 411 <include name="IDR_MD_PROFILE_BROWSER_PROXY_HTML" file="resources\md_use r_manager\profile_browser_proxy.html" flattenhtml="true" type="BINDATA" />
410 <include name="IDR_MD_PROFILE_BROWSER_PROXY_JS" file="resources\md_user_ manager\profile_browser_proxy.js" type="BINDATA" /> 412 <include name="IDR_MD_PROFILE_BROWSER_PROXY_JS" file="resources\md_user_ manager\profile_browser_proxy.js" type="BINDATA" />
411 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_CSS" file="resources\md _user_manager\supervised_user_learn_more.css" flattenhtml="true" type="BINDATA" /> 413 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_CSS" file="resources\md _user_manager\supervised_user_learn_more.css" flattenhtml="true" type="BINDATA" />
412 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_HTML" file="resources\m d_user_manager\supervised_user_learn_more.html" flattenhtml="true" type="BINDATA " /> 414 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_HTML" file="resources\m d_user_manager\supervised_user_learn_more.html" flattenhtml="true" type="BINDATA " />
413 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_JS" file="resources\md_ user_manager\supervised_user_learn_more.js" type="BINDATA" /> 415 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_JS" file="resources\md_ user_manager\supervised_user_learn_more.js" type="BINDATA" />
414 <include name="IDR_MD_USER_MANAGER_HTML" file="resources\md_user_manager \user_manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 416 <include name="IDR_MD_USER_MANAGER_HTML" file="resources\md_user_manager \user_manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
415 <include name="IDR_MD_USER_MANAGER_JS" file="resources\md_user_manager\u ser_manager.js" flattenhtml="true" type="BINDATA" /> 417 <include name="IDR_MD_USER_MANAGER_JS" file="resources\md_user_manager\u ser_manager.js" flattenhtml="true" type="BINDATA" />
416 <include name="IDR_MD_USER_MANAGER_PAGES_CSS" file="resources\md_user_ma nager\user_manager_pages.css" flattenhtml="true" type="BINDATA" /> 418 <include name="IDR_MD_USER_MANAGER_PAGES_CSS" file="resources\md_user_ma nager\user_manager_pages.css" flattenhtml="true" type="BINDATA" />
417 <include name="IDR_MD_USER_MANAGER_PAGES_HTML" file="resources\md_user_m anager\user_manager_pages.html" flattenhtml="true" type="BINDATA" /> 419 <include name="IDR_MD_USER_MANAGER_PAGES_HTML" file="resources\md_user_m anager\user_manager_pages.html" flattenhtml="true" type="BINDATA" />
418 <include name="IDR_MD_USER_MANAGER_PAGES_JS" file="resources\md_user_man ager\user_manager_pages.js" type="BINDATA" /> 420 <include name="IDR_MD_USER_MANAGER_PAGES_JS" file="resources\md_user_man ager\user_manager_pages.js" type="BINDATA" />
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 <part file="media_router_resources.grdp" /> 506 <part file="media_router_resources.grdp" />
505 </if> 507 </if>
506 <if expr="not is_android and not is_ios and not chromeos"> 508 <if expr="not is_android and not is_ios and not chromeos">
507 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 509 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
508 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 510 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
509 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 511 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
510 </if> 512 </if>
511 </includes> 513 </includes>
512 </release> 514 </release>
513 </grit> 515 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/md_user_manager/compiled_resources2.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698