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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1954383002: MD Settings: combine bluetooth adding and pairing dialogs into one (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: whoops, html deps Created 4 years, 7 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/bluetooth_page/compiled_resources2.gyp ('k') | chrome/test/data/webui/settings/bluetooth_page_browsertest_chromeos.js » ('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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 <structure name="IDR_SETTINGS_SETTINGS_JS" 735 <structure name="IDR_SETTINGS_SETTINGS_JS"
736 file="settings.js" 736 file="settings.js"
737 type="chrome_html" /> 737 type="chrome_html" />
738 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML" 738 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"
739 file="site_settings/website_usage_private_api.html" 739 file="site_settings/website_usage_private_api.html"
740 type="chrome_html" /> 740 type="chrome_html" />
741 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS" 741 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"
742 file="site_settings/website_usage_private_api.js" 742 file="site_settings/website_usage_private_api.js"
743 type="chrome_html" /> 743 type="chrome_html" />
744 <if expr="chromeos"> 744 <if expr="chromeos">
745 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"
746 file="bluetooth_page/bluetooth_device_dialog.html"
747 type="chrome_html" />
748 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_JS"
749 file="bluetooth_page/bluetooth_device_dialog.js"
750 type="chrome_html" />
745 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML" 751 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML"
746 file="bluetooth_page/bluetooth_device_list_item.html" 752 file="bluetooth_page/bluetooth_device_list_item.html"
747 type="chrome_html" /> 753 type="chrome_html" />
748 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_JS" 754 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_JS"
749 file="bluetooth_page/bluetooth_device_list_item.js" 755 file="bluetooth_page/bluetooth_device_list_item.js"
750 type="chrome_html" /> 756 type="chrome_html" />
751 <structure name="IDR_SETTINGS_BLUETOOTH_DIALOG_SHARED_CSS_HTML" 757 <structure name="IDR_SETTINGS_BLUETOOTH_DIALOG_SHARED_CSS_HTML"
752 file="bluetooth_page/bluetooth_dialog_shared_css.html" 758 file="bluetooth_page/bluetooth_dialog_shared_css.html"
753 type="chrome_html" /> 759 type="chrome_html" />
754 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_HTML" 760 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_HTML"
755 file="bluetooth_page/bluetooth_page.html" 761 file="bluetooth_page/bluetooth_page.html"
756 type="chrome_html" /> 762 type="chrome_html" />
757 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_JS" 763 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_JS"
758 file="bluetooth_page/bluetooth_page.js" 764 file="bluetooth_page/bluetooth_page.js"
759 type="chrome_html" /> 765 type="chrome_html" />
760 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_HTML"
761 file="bluetooth_page/bluetooth_add_device_dialog.html"
762 type="chrome_html" />
763 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_JS"
764 file="bluetooth_page/bluetooth_add_device_dialog.js"
765 type="chrome_html" />
766 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_HTML"
767 file="bluetooth_page/bluetooth_pair_device_dialog.html"
768 type="chrome_html" />
769 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_JS"
770 file="bluetooth_page/bluetooth_pair_device_dialog.js"
771 type="chrome_html" />
772 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML" 766 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"
773 file="date_time_page/date_time_page.html" 767 file="date_time_page/date_time_page.html"
774 type="chrome_html" /> 768 type="chrome_html" />
775 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS" 769 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS"
776 file="date_time_page/date_time_page.js" 770 file="date_time_page/date_time_page.js"
777 type="chrome_html" /> 771 type="chrome_html" />
778 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS" 772 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS"
779 file="internet_page/internet_detail_page.css" 773 file="internet_page/internet_detail_page.css"
780 type="chrome_html" /> 774 type="chrome_html" />
781 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML" 775 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 type="chrome_html" 945 type="chrome_html"
952 flattenhtml="true" 946 flattenhtml="true"
953 allowexternalscript="true" /> 947 allowexternalscript="true" />
954 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 948 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
955 file="people_page/users_page.css" 949 file="people_page/users_page.css"
956 type="chrome_html" /> 950 type="chrome_html" />
957 </if> 951 </if>
958 </structures> 952 </structures>
959 </release> 953 </release>
960 </grit> 954 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/compiled_resources2.gyp ('k') | chrome/test/data/webui/settings/bluetooth_page_browsertest_chromeos.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698