chrome/browser/resources/settings/settings_resources.grd - Issue 1666623006: MD Settings: Manage search engines 3/3, hooking up UI.

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

Issue 1666623006: MD Settings: Manage search engines 3/3, hooking up UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@manage_search_engines_handler

Patch Set: Resolving conflicts with ToT 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 459 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
470 type="chrome_html" />	470 type="chrome_html" />

471 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_CSS"	471 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_CSS"

472 file="site_settings/site_details_permission.css"	472 file="site_settings/site_details_permission.css"

473 type="chrome_html" />	473 type="chrome_html" />

474 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_HTML"	474 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_HTML"

475 file="site_settings/site_details_permission.html"	475 file="site_settings/site_details_permission.html"

476 type="chrome_html" />	476 type="chrome_html" />

477 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_JS"	477 <structure name="IDR_SETTINGS_SITE_DETAILS_PERMISSION_JS"

478 file="site_settings/site_details_permission.js"	478 file="site_settings/site_details_permission.js"

479 type="chrome_html" />	479 type="chrome_html" />

480 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_ADD_SEARCH_ENGINE_DIALOG _JS"	480 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_JS"

481 file="search_engines_page/add_search_engine_dialog.js"	481 file="search_engines_page/search_engine_dialog.js"

482 type="chrome_html" />	482 type="chrome_html" />

483 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_ADD_SEARCH_ENGINE_DIALOG _HTML"	483 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_HTM L"

484 file="search_engines_page/add_search_engine_dialog.html"	484 file="search_engines_page/search_engine_dialog.html"

485 type="chrome_html"	485 type="chrome_html"

486 flattenhtml="true"	486 flattenhtml="true"

487 allowexternalscript="true" />	487 allowexternalscript="true" />

488 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"	488 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"

489 file="search_engines_page/search_engine_entry.js"	489 file="search_engines_page/search_engine_entry.js"

490 type="chrome_html" />	490 type="chrome_html" />

491 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_HTML "	491 <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_HTML "

492 file="search_engines_page/search_engine_entry.html"	492 file="search_engines_page/search_engine_entry.html"

493 type="chrome_html"	493 type="chrome_html"

494 flattenhtml="true"	494 flattenhtml="true"

(...skipping 276 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
771 type="chrome_html"	771 type="chrome_html"

772 flattenhtml="true"	772 flattenhtml="true"

773 allowexternalscript="true" />	773 allowexternalscript="true" />

774 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	774 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

775 file="people_page/users_page.css"	775 file="people_page/users_page.css"

776 type="chrome_html" />	776 type="chrome_html" />

777 </if>	777 </if>

778 </structures>	778 </structures>

779 </release>	779 </release>

780 </grit>	780 </grit>

OLD	NEW