chrome/browser/resources/settings/settings_resources.grd - Issue 2141313002: Settings Router Refactor: Implement new Route class w/ test

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

Issue 2141313002: Settings Router Refactor: Implement new Route class w/ test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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/settings_page/settings_router.html ('K') | « chrome/browser/resources/settings/settings_page/settings_router.html ('k') | chrome/test/data/webui/settings/router_tests.js » ('j') | chrome/test/data/webui/settings/router_tests.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 629 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
640 flattenhtml="true"	640 flattenhtml="true"

641 type="chrome_html" />	641 type="chrome_html" />

642 <if expr="is_win or is_macosx">	642 <if expr="is_win or is_macosx">

643 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"	643 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"

644 file="privacy_page/privacy_page_browser_proxy.html"	644 file="privacy_page/privacy_page_browser_proxy.html"

645 type="chrome_html" />	645 type="chrome_html" />

646 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"	646 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"

647 file="privacy_page/privacy_page_browser_proxy.js"	647 file="privacy_page/privacy_page_browser_proxy.js"

648 type="chrome_html" />	648 type="chrome_html" />

649 </if>	649 </if>

	650 <structure name="IDR_SETTINGS_SETTINGS_ROUTE_HTML"

	651 file="settings_page/route.html"

	652 type="chrome_html" />

	653 <structure name="IDR_SETTINGS_SETTINGS_ROUTE_JS"

	654 file="settings_page/route.js"

	655 type="chrome_html"

	656 flattenhtml="true"
	michaelpg 2016/07/13 05:53:39 do you need this? do you need this? tommycli 2016/07/13 17:45:03 Done. Show quoted text On 2016/07/13 05:53:39, michaelpg (slow) wrote: > do you need this? Done.
	657 allowexternalscript="true" />
	michaelpg 2016/07/13 05:53:39 ditto ditto tommycli 2016/07/13 17:45:03 Done. Show quoted text On 2016/07/13 05:53:39, michaelpg (slow) wrote: > ditto Done.
650 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"	658 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"

651 file="settings_page/settings_router.html"	659 file="settings_page/settings_router.html"

652 type="chrome_html" />	660 type="chrome_html" />

653 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"	661 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"

654 file="settings_page/settings_router.js"	662 file="settings_page/settings_router.js"

655 type="chrome_html"	663 type="chrome_html"

656 flattenhtml="true"	664 flattenhtml="true"

657 allowexternalscript="true" />	665 allowexternalscript="true" />

658 <structure name="IDR_SETTINGS_SITE_DATA_HTML"	666 <structure name="IDR_SETTINGS_SITE_DATA_HTML"

659 file="site_settings/site_data.html"	667 file="site_settings/site_data.html"

(...skipping 338 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
998 type="chrome_html" />	1006 type="chrome_html" />

999 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1007 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1000 file="people_page/users_page.html"	1008 file="people_page/users_page.html"

1001 type="chrome_html"	1009 type="chrome_html"

1002 flattenhtml="true"	1010 flattenhtml="true"

1003 allowexternalscript="true" />	1011 allowexternalscript="true" />

1004 </if>	1012 </if>

1005 </structures>	1013 </structures>

1006 </release>	1014 </release>

1007 </grit>	1015 </grit>

OLD	NEW