chrome/browser/resources/settings/settings_resources.grd - Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout

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

Issue 1652553002: [MD settings] adjusting heights of settings rows; removing two .css files; unifying settings layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master Created 4 years, 10 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

OLD	NEW
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 572 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
583 type="chrome_html" />	583 type="chrome_html" />

584 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_JS"	584 <structure name="IDR_SETTINGS_BLUETOOTH_ADD_DEVICE_DIALOG_JS"

585 file="bluetooth_page/bluetooth_add_device_dialog.js"	585 file="bluetooth_page/bluetooth_add_device_dialog.js"

586 type="chrome_html" />	586 type="chrome_html" />

587 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_HTML"	587 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_HTML"

588 file="bluetooth_page/bluetooth_pair_device_dialog.html"	588 file="bluetooth_page/bluetooth_pair_device_dialog.html"

589 type="chrome_html" />	589 type="chrome_html" />

590 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_JS"	590 <structure name="IDR_SETTINGS_BLUETOOTH_PAIR_DEVICE_DIALOG_JS"

591 file="bluetooth_page/bluetooth_pair_device_dialog.js"	591 file="bluetooth_page/bluetooth_pair_device_dialog.js"

592 type="chrome_html" />	592 type="chrome_html" />

593 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_CSS"

594 file="date_time_page/date_time_page.css"

595 type="chrome_html" />

596 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"	593 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_HTML"

597 file="date_time_page/date_time_page.html"	594 file="date_time_page/date_time_page.html"

598 type="chrome_html" />	595 type="chrome_html" />

599 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS"	596 <structure name="IDR_SETTINGS_DATE_TIME_PAGE_JS"

600 file="date_time_page/date_time_page.js"	597 file="date_time_page/date_time_page.js"

601 type="chrome_html" />	598 type="chrome_html" />

602 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS"	599 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_CSS"

603 file="internet_page/internet_detail_page.css"	600 file="internet_page/internet_detail_page.css"

604 type="chrome_html" />	601 type="chrome_html" />

605 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML"	602 <structure name="IDR_SETTINGS_INTERNET_DETAIL_PAGE_HTML"

(...skipping 144 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
750 type="chrome_html"	747 type="chrome_html"

751 flattenhtml="true"	748 flattenhtml="true"

752 allowexternalscript="true" />	749 allowexternalscript="true" />

753 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	750 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

754 file="people_page/users_page.css"	751 file="people_page/users_page.css"

755 type="chrome_html" />	752 type="chrome_html" />

756 </if>	753 </if>

757 </structures>	754 </structures>

758 </release>	755 </release>

759 </grit>	756 </grit>

OLD	NEW