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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2025433002: MD User Manager: Display error message when all profiles are locked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments Created 4 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profiles_state.h » ('j') | chrome/browser/profiles/profiles_state.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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after
405 </if> 405 </if>
406 <if expr="not is_android and not is_ios and not chromeos"> 406 <if expr="not is_android and not is_ios and not chromeos">
407 <include name="IDR_USER_MANAGER_JS" file="resources\user_manager\user_ma nager.js" flattenhtml="true" type="BINDATA" /> 407 <include name="IDR_USER_MANAGER_JS" file="resources\user_manager\user_ma nager.js" flattenhtml="true" type="BINDATA" />
408 <include name="IDR_USER_MANAGER_HTML" file="resources\user_manager\user_ manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 408 <include name="IDR_USER_MANAGER_HTML" file="resources\user_manager\user_ manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
409 </if> 409 </if>
410 <if expr="not is_android and not is_ios and not chromeos"> 410 <if expr="not is_android and not is_ios and not chromeos">
411 <include name="IDR_MD_CONTROL_BAR_HTML" file="resources\md_user_manager\ control_bar.html" flattenhtml="true" type="BINDATA" /> 411 <include name="IDR_MD_CONTROL_BAR_HTML" file="resources\md_user_manager\ control_bar.html" flattenhtml="true" type="BINDATA" />
412 <include name="IDR_MD_CONTROL_BAR_JS" file="resources\md_user_manager\co ntrol_bar.js" type="BINDATA" /> 412 <include name="IDR_MD_CONTROL_BAR_JS" file="resources\md_user_manager\co ntrol_bar.js" type="BINDATA" />
413 <include name="IDR_MD_CREATE_PROFILE_HTML" file="resources\md_user_manag er\create_profile.html" flattenhtml="true" type="BINDATA" /> 413 <include name="IDR_MD_CREATE_PROFILE_HTML" file="resources\md_user_manag er\create_profile.html" flattenhtml="true" type="BINDATA" />
414 <include name="IDR_MD_CREATE_PROFILE_JS" file="resources\md_user_manager \create_profile.js" type="BINDATA" /> 414 <include name="IDR_MD_CREATE_PROFILE_JS" file="resources\md_user_manager \create_profile.js" type="BINDATA" />
415 <include name="IDR_MD_ERROR_DIALOG_HTML" file="resources\md_user_manager \error_dialog.html" flattenhtml="true" type="BINDATA" />
416 <include name="IDR_MD_ERROR_DIALOG_JS" file="resources\md_user_manager\e rror_dialog.js" type="BINDATA" />
415 <include name="IDR_MD_IMPORT_SUPERVISED_USER_HTML" file="resources\md_us er_manager\import_supervised_user.html" flattenhtml="true" type="BINDATA" /> 417 <include name="IDR_MD_IMPORT_SUPERVISED_USER_HTML" file="resources\md_us er_manager\import_supervised_user.html" flattenhtml="true" type="BINDATA" />
416 <include name="IDR_MD_IMPORT_SUPERVISED_USER_JS" file="resources\md_user _manager\import_supervised_user.js" type="BINDATA" /> 418 <include name="IDR_MD_IMPORT_SUPERVISED_USER_JS" file="resources\md_user _manager\import_supervised_user.js" type="BINDATA" />
417 <include name="IDR_MD_PROFILE_BROWSER_PROXY_HTML" file="resources\md_use r_manager\profile_browser_proxy.html" flattenhtml="true" type="BINDATA" /> 419 <include name="IDR_MD_PROFILE_BROWSER_PROXY_HTML" file="resources\md_use r_manager\profile_browser_proxy.html" flattenhtml="true" type="BINDATA" />
418 <include name="IDR_MD_PROFILE_BROWSER_PROXY_JS" file="resources\md_user_ manager\profile_browser_proxy.js" type="BINDATA" /> 420 <include name="IDR_MD_PROFILE_BROWSER_PROXY_JS" file="resources\md_user_ manager\profile_browser_proxy.js" type="BINDATA" />
419 <include name="IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_HTML" file="resourc es\md_user_manager\supervised_user_create_confirm.html" flattenhtml="true" type= "BINDATA" /> 421 <include name="IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_HTML" file="resourc es\md_user_manager\supervised_user_create_confirm.html" flattenhtml="true" type= "BINDATA" />
420 <include name="IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_JS" file="resources \md_user_manager\supervised_user_create_confirm.js" type="BINDATA" /> 422 <include name="IDR_MD_SUPERVISED_USER_CREATE_CONFIRM_JS" file="resources \md_user_manager\supervised_user_create_confirm.js" type="BINDATA" />
421 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_HTML" file="resources\m d_user_manager\supervised_user_learn_more.html" flattenhtml="true" type="BINDATA " /> 423 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_HTML" file="resources\m d_user_manager\supervised_user_learn_more.html" flattenhtml="true" type="BINDATA " />
422 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_JS" file="resources\md_ user_manager\supervised_user_learn_more.js" type="BINDATA" /> 424 <include name="IDR_MD_SUPERVISED_USER_LEARN_MORE_JS" file="resources\md_ user_manager\supervised_user_learn_more.js" type="BINDATA" />
423 <include name="IDR_MD_USER_MANAGER_HTML" file="resources\md_user_manager \user_manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 425 <include name="IDR_MD_USER_MANAGER_HTML" file="resources\md_user_manager \user_manager.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
424 <include name="IDR_MD_USER_MANAGER_JS" file="resources\md_user_manager\u ser_manager.js" flattenhtml="true" type="BINDATA" /> 426 <include name="IDR_MD_USER_MANAGER_JS" file="resources\md_user_manager\u ser_manager.js" flattenhtml="true" type="BINDATA" />
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
513 <part file="media_router_resources.grdp" /> 515 <part file="media_router_resources.grdp" />
514 </if> 516 </if>
515 <if expr="not is_android and not is_ios and not chromeos"> 517 <if expr="not is_android and not is_ios and not chromeos">
516 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" /> 518 <include name="IDR_IME_WINDOW_CLOSE" file="resources\input_ime\ime_windo w_close.png" type="BINDATA" />
517 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" /> 519 <include name="IDR_IME_WINDOW_CLOSE_C" file="resources\input_ime\ime_win dow_close_click.png" type="BINDATA" />
518 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" /> 520 <include name="IDR_IME_WINDOW_CLOSE_H" file="resources\input_ime\ime_win dow_close_hover.png" type="BINDATA" />
519 </if> 521 </if>
520 </includes> 522 </includes>
521 </release> 523 </release>
522 </grit> 524 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/profiles_state.h » ('j') | chrome/browser/profiles/profiles_state.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698