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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2098633002: Migrate the one-time notice into the MD settings CBD dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_counters
Patch Set: 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
« chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html ('K') | « chrome/browser/resources/settings/clear_browsing_data_dialog/other_forms_of_browsing_history_notice.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc » ('J')
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 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS" 468 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"
469 file="languages_page/edit_dictionary_page.js" 469 file="languages_page/edit_dictionary_page.js"
470 type="chrome_html" /> 470 type="chrome_html" />
471 </if> 471 </if>
472 <structure name="IDR_SETTINGS_MEDIA_PICKER_HTML" 472 <structure name="IDR_SETTINGS_MEDIA_PICKER_HTML"
473 file="site_settings/media_picker.html" 473 file="site_settings/media_picker.html"
474 type="chrome_html" /> 474 type="chrome_html" />
475 <structure name="IDR_SETTINGS_MEDIA_PICKER_JS" 475 <structure name="IDR_SETTINGS_MEDIA_PICKER_JS"
476 file="site_settings/media_picker.js" 476 file="site_settings/media_picker.js"
477 type="chrome_html" /> 477 type="chrome_html" />
478 <structure name="IDR_SETTINGS_OTHER_FORMS_OF_BROWSING_HISTORY_NOTICE_HTML"
479 file="clear_browsing_data_dialog/other_forms_of_browsing_histor y_notice.html"
480 type="chrome_html" />
481 <structure name="IDR_SETTINGS_OTHER_FORMS_OF_BROWSING_HISTORY_NOTICE_JS"
482 file="clear_browsing_data_dialog/other_forms_of_browsing_histor y_notice.js"
483 type="chrome_html" />
478 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML" 484 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML"
479 file="passwords_and_forms_page/passwords_and_forms_page.html" 485 file="passwords_and_forms_page/passwords_and_forms_page.html"
480 type="chrome_html" /> 486 type="chrome_html" />
481 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS" 487 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"
482 file="passwords_and_forms_page/passwords_and_forms_page.js" 488 file="passwords_and_forms_page/passwords_and_forms_page.js"
483 type="chrome_html" /> 489 type="chrome_html" />
484 <structure name="IDR_SETTINGS_PASSWORDS_SHARED_CSS_HTML" 490 <structure name="IDR_SETTINGS_PASSWORDS_SHARED_CSS_HTML"
485 file="passwords_and_forms_page/passwords_shared_css.html" 491 file="passwords_and_forms_page/passwords_shared_css.html"
486 type="chrome_html" /> 492 type="chrome_html" />
487 <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_HTML" 493 <structure name="IDR_SETTINGS_CREDIT_CARD_EDIT_DIALOG_HTML"
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 type="chrome_html" /> 924 type="chrome_html" />
919 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 925 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
920 file="people_page/users_page.html" 926 file="people_page/users_page.html"
921 type="chrome_html" 927 type="chrome_html"
922 flattenhtml="true" 928 flattenhtml="true"
923 allowexternalscript="true" /> 929 allowexternalscript="true" />
924 </if> 930 </if>
925 </structures> 931 </structures>
926 </release> 932 </release>
927 </grit> 933 </grit>
OLDNEW
« chrome/browser/resources/settings/clear_browsing_data_dialog/clear_browsing_data_dialog.html ('K') | « chrome/browser/resources/settings/clear_browsing_data_dialog/other_forms_of_browsing_history_notice.js ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc » ('j') | chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698