chrome/browser/resources/settings/settings_resources.grd - Issue 2039833004: Site Settings Desktop: Implement media picker for camera/mic categories.

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

Issue 2039833004: Site Settings Desktop: Implement media picker for camera/mic categories. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address feedback Created 4 years, 6 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/privacy_page/privacy_page.html ('k') | chrome/browser/resources/settings/site_settings/media_picker.html » ('j') | no next file with comments »
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 444 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
455 flattenhtml="true"	455 flattenhtml="true"

456 allowexternalscript="true" />	456 allowexternalscript="true" />

457 <if expr="not is_macosx">	457 <if expr="not is_macosx">

458 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_HTML"	458 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_HTML"

459 file="languages_page/edit_dictionary_page.html"	459 file="languages_page/edit_dictionary_page.html"

460 type="chrome_html" />	460 type="chrome_html" />

461 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"	461 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"

462 file="languages_page/edit_dictionary_page.js"	462 file="languages_page/edit_dictionary_page.js"

463 type="chrome_html" />	463 type="chrome_html" />

464 </if>	464 </if>

	465 <structure name="IDR_SETTINGS_MEDIA_PICKER_HTML"

	466 file="site_settings/media_picker.html"

	467 type="chrome_html" />

	468 <structure name="IDR_SETTINGS_MEDIA_PICKER_JS"

	469 file="site_settings/media_picker.js"

	470 type="chrome_html" />

465 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML"	471 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML"

466 file="passwords_and_forms_page/passwords_and_forms_page.html"	472 file="passwords_and_forms_page/passwords_and_forms_page.html"

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

468 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"	474 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"

469 file="passwords_and_forms_page/passwords_and_forms_page.js"	475 file="passwords_and_forms_page/passwords_and_forms_page.js"

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

471 <structure name="IDR_SETTINGS_PASSWORDS_SHARED_CSS_HTML"	477 <structure name="IDR_SETTINGS_PASSWORDS_SHARED_CSS_HTML"

472 file="passwords_and_forms_page/passwords_shared_css.html"	478 file="passwords_and_forms_page/passwords_shared_css.html"

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

474 <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_HTML"	480 <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_HTML"

(...skipping 430 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
905 type="chrome_html" />	911 type="chrome_html" />

906 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	912 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

907 file="people_page/users_page.html"	913 file="people_page/users_page.html"

908 type="chrome_html"	914 type="chrome_html"

909 flattenhtml="true"	915 flattenhtml="true"

910 allowexternalscript="true" />	916 allowexternalscript="true" />

911 </if>	917 </if>

912 </structures>	918 </structures>

913 </release>	919 </release>

914 </grit>	920 </grit>

OLD	NEW