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

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: tests 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
« chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js ('K') | « 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 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 <structure name="IDR_SETTINGS_SETTINGS_JS" 734 <structure name="IDR_SETTINGS_SETTINGS_JS"
735 file="settings.js" 735 file="settings.js"
736 type="chrome_html" /> 736 type="chrome_html" />
737 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML" 737 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"
738 file="site_settings/website_usage_private_api.html" 738 file="site_settings/website_usage_private_api.html"
739 type="chrome_html" /> 739 type="chrome_html" />
740 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS" 740 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"
741 file="site_settings/website_usage_private_api.js" 741 file="site_settings/website_usage_private_api.js"
742 type="chrome_html" /> 742 type="chrome_html" />
743 <if expr="chromeos"> 743 <if expr="chromeos">
744 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"
745 file="bluetooth_page/bluetooth_device_dialog.html"
746 type="chrome_html" />
747 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_JS"
748 file="bluetooth_page/bluetooth_device_dialog.js"
749 type="chrome_html" />
744 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML" 750 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_HTML"
745 file="bluetooth_page/bluetooth_device_list_item.html" 751 file="bluetooth_page/bluetooth_device_list_item.html"
746 type="chrome_html" /> 752 type="chrome_html" />
747 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_JS" 753 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_LIST_ITEM_JS"
748 file="bluetooth_page/bluetooth_device_list_item.js" 754 file="bluetooth_page/bluetooth_device_list_item.js"
749 type="chrome_html" /> 755 type="chrome_html" />
750 <structure name="IDR_SETTINGS_BLUETOOTH_DIALOG_SHARED_CSS_HTML" 756 <structure name="IDR_SETTINGS_BLUETOOTH_DIALOG_SHARED_CSS_HTML"
751 file="bluetooth_page/bluetooth_dialog_shared_css.html" 757 file="bluetooth_page/bluetooth_dialog_shared_css.html"
752 type="chrome_html" /> 758 type="chrome_html" />
753 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_HTML" 759 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_HTML"
754 file="bluetooth_page/bluetooth_page.html" 760 file="bluetooth_page/bluetooth_page.html"
755 type="chrome_html" /> 761 type="chrome_html" />
756 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_JS" 762 <structure name="IDR_SETTINGS_BLUETOOTH_PAGE_JS"
757 file="bluetooth_page/bluetooth_page.js" 763 file="bluetooth_page/bluetooth_page.js"
758 type="chrome_html" /> 764 type="chrome_html" />
759 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_HTML"
760 file="bluetooth_page/bluetooth_add_device_dialog.html"
761 type="chrome_html" />
762 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_JS"
763 file="bluetooth_page/bluetooth_add_device_dialog.js"
764 type="chrome_html" />
765 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_HTML"
766 file="bluetooth_page/bluetooth_pair_device_dialog.html"
767 type="chrome_html" />
768 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_JS"
769 file="bluetooth_page/bluetooth_pair_device_dialog.js"
770 type="chrome_html" />
771 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML" 765 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"
772 file="date_time_page/date_time_page.html" 766 file="date_time_page/date_time_page.html"
773 type="chrome_html" /> 767 type="chrome_html" />
774 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS" 768 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS"
775 file="date_time_page/date_time_page.js" 769 file="date_time_page/date_time_page.js"
776 type="chrome_html" /> 770 type="chrome_html" />
777 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS" 771 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS"
778 file="internet_page/internet_detail_page.css" 772 file="internet_page/internet_detail_page.css"
779 type="chrome_html" /> 773 type="chrome_html" />
780 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML" 774 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML"
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 type="chrome_html" 944 type="chrome_html"
951 flattenhtml="true" 945 flattenhtml="true"
952 allowexternalscript="true" /> 946 allowexternalscript="true" />
953 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 947 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
954 file="people_page/users_page.css" 948 file="people_page/users_page.css"
955 type="chrome_html" /> 949 type="chrome_html" />
956 </if> 950 </if>
957 </structures> 951 </structures>
958 </release> 952 </release>
959 </grit> 953 </grit>
OLDNEW
« chrome/browser/resources/settings/bluetooth_page/bluetooth_device_dialog.js ('K') | « 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