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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1575543003: Settings People Revamp: Implement parts of ChromeOS Change Picture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix change_picture_handler to accomodate origin/master changes Created 4 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
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h » ('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/settings_resources.h" type="rc_header"> 4 <output filename="grit/settings_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/settings_resources_map.cc" 7 <output filename="grit/settings_resources_map.cc"
8 type="resource_file_map_source" /> 8 type="resource_file_map_source" />
9 <output filename="grit/settings_resources_map.h" 9 <output filename="grit/settings_resources_map.h"
10 type="resource_map_header" /> 10 type="resource_map_header" />
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 file="passwords_and_forms_page/passwords_section.css" 336 file="passwords_and_forms_page/passwords_section.css"
337 type="chrome_html" /> 337 type="chrome_html" />
338 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML" 338 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_HTML"
339 file="passwords_and_forms_page/passwords_section.html" 339 file="passwords_and_forms_page/passwords_section.html"
340 type="chrome_html" /> 340 type="chrome_html" />
341 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_JS" 341 <structure name="IDR_SETTINGS_PASSWORDS_SECTION_JS"
342 file="passwords_and_forms_page/passwords_section.js" 342 file="passwords_and_forms_page/passwords_section.js"
343 type="chrome_html" /> 343 type="chrome_html" />
344 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CSS" 344 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CSS"
345 file="people_page/people_page.css" 345 file="people_page/people_page.css"
346 type="chrome_html" /> 346 type="chrome_html"
347 flattenhtml="true"
348 allowexternalscript="true" />
347 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML" 349 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"
348 file="people_page/people_page.html" 350 file="people_page/people_page.html"
349 type="chrome_html" 351 type="chrome_html"
350 flattenhtml="true" 352 flattenhtml="true"
351 allowexternalscript="true" /> 353 allowexternalscript="true" />
352 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS" 354 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
353 file="people_page/people_page.js" 355 file="people_page/people_page.js"
354 type="chrome_html" 356 type="chrome_html"
355 flattenhtml="true" 357 flattenhtml="true"
356 allowexternalscript="true" /> 358 allowexternalscript="true" />
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML" 533 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML"
532 file="people_page/sync_page.html" 534 file="people_page/sync_page.html"
533 type="chrome_html" 535 type="chrome_html"
534 flattenhtml="true" 536 flattenhtml="true"
535 allowexternalscript="true" /> 537 allowexternalscript="true" />
536 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS" 538 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS"
537 file="people_page/sync_page.css" 539 file="people_page/sync_page.css"
538 type="chrome_html" /> 540 type="chrome_html" />
539 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS" 541 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS"
540 file="people_page/sync_private_api.js" 542 file="people_page/sync_private_api.js"
541 type="chrome_html" /> 543 type="chrome_html"
544 flattenhtml="true"
545 allowexternalscript="true" />
542 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML" 546 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML"
543 file="people_page/sync_private_api.html" 547 file="people_page/sync_private_api.html"
544 type="chrome_html" 548 type="chrome_html"
545 flattenhtml="true" 549 flattenhtml="true"
546 allowexternalscript="true" /> 550 allowexternalscript="true" />
547 <structure name="IDR_SETTINGS_SETTINGS_HTML" 551 <structure name="IDR_SETTINGS_SETTINGS_HTML"
548 file="settings.html" 552 file="settings.html"
549 type="chrome_html" /> 553 type="chrome_html" />
550 <structure name="IDR_SETTINGS_SETTINGS_JS" 554 <structure name="IDR_SETTINGS_SETTINGS_JS"
551 file="settings.js" 555 file="settings.js"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 type="chrome_html" /> 701 type="chrome_html" />
698 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS" 702 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_CSS"
699 file="internet_page/network_summary_item.css" 703 file="internet_page/network_summary_item.css"
700 type="chrome_html" /> 704 type="chrome_html" />
701 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_HTML" 705 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_HTML"
702 file="internet_page/network_summary_item.html" 706 file="internet_page/network_summary_item.html"
703 type="chrome_html" /> 707 type="chrome_html" />
704 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_JS" 708 <structure name="IDR_SETTINGS_NETWORK_SUMMARY_ITEM_JS"
705 file="internet_page/network_summary_item.js" 709 file="internet_page/network_summary_item.js"
706 type="chrome_html" /> 710 type="chrome_html" />
711 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_PRIVATE_API_JS"
712 file="people_page/change_picture_private_api.js"
713 type="chrome_html"
714 flattenhtml="true"
715 allowexternalscript="true" />
716 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_CSS"
717 file="people_page/change_picture.css"
718 type="chrome_html" />
719 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_HTML"
720 file="people_page/change_picture.html"
721 type="chrome_html"
722 flattenhtml="true"
723 allowexternalscript="true" />
724 <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_JS"
725 file="people_page/change_picture.js"
726 type="chrome_html" />
727 <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_PRIVATE_API_HTML"
728 file="people_page/change_picture_private_api.html"
729 type="chrome_html"
730 flattenhtml="true"
731 allowexternalscript="true" />
707 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS" 732 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"
708 file="people_page/user_list.js" 733 file="people_page/user_list.js"
709 type="chrome_html" /> 734 type="chrome_html" />
710 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML" 735 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"
711 file="people_page/user_list.html" 736 file="people_page/user_list.html"
712 type="chrome_html" 737 type="chrome_html"
713 flattenhtml="true" 738 flattenhtml="true"
714 allowexternalscript="true" /> 739 allowexternalscript="true" />
715 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS" 740 <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_CSS"
716 file="people_page/user_list.css" 741 file="people_page/user_list.css"
717 type="chrome_html" /> 742 type="chrome_html" />
718 <structure name="IDR_SETTINGS_USERS_PAGE_JS" 743 <structure name="IDR_SETTINGS_USERS_PAGE_JS"
719 file="people_page/users_page.js" 744 file="people_page/users_page.js"
720 type="chrome_html" /> 745 type="chrome_html" />
721 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 746 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
722 file="people_page/users_page.html" 747 file="people_page/users_page.html"
723 type="chrome_html" 748 type="chrome_html"
724 flattenhtml="true" 749 flattenhtml="true"
725 allowexternalscript="true" /> 750 allowexternalscript="true" />
726 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 751 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
727 file="people_page/users_page.css" 752 file="people_page/users_page.css"
728 type="chrome_html" /> 753 type="chrome_html" />
729 </if> 754 </if>
730 </structures> 755 </structures>
731 </release> 756 </release>
732 </grit> 757 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698