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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1503333003: Settings People Rewrite: Make Sync/Sign-in naming consistent to People. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge upstream changes Created 5 years 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/settings_menu/settings_menu.html ('k') | chrome/browser/resources/settings/signin_page/signin_page.html » ('j') | no next file with comments »
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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS" 313 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"
314 file="languages_page/edit_dictionary_page.js" 314 file="languages_page/edit_dictionary_page.js"
315 type="chrome_html" /> 315 type="chrome_html" />
316 </if> 316 </if>
317 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML" 317 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML"
318 file="passwords_and_forms_page/passwords_and_forms_page.html" 318 file="passwords_and_forms_page/passwords_and_forms_page.html"
319 type="chrome_html" /> 319 type="chrome_html" />
320 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS" 320 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"
321 file="passwords_and_forms_page/passwords_and_forms_page.js" 321 file="passwords_and_forms_page/passwords_and_forms_page.js"
322 type="chrome_html" /> 322 type="chrome_html" />
323 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
324 file="people_page/people_page.js"
325 type="chrome_html" />
326 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"
327 file="people_page/people_page.html"
328 type="chrome_html"
329 flattenhtml="true"
330 allowexternalscript="true" />
323 <structure name="IDR_SETTINGS_PREF_UTIL_HTML" 331 <structure name="IDR_SETTINGS_PREF_UTIL_HTML"
324 file="prefs/pref_util.html" 332 file="prefs/pref_util.html"
325 type="chrome_html" /> 333 type="chrome_html" />
326 <structure name="IDR_SETTINGS_PREF_UTIL_JS" 334 <structure name="IDR_SETTINGS_PREF_UTIL_JS"
327 file="prefs/pref_util.js" 335 file="prefs/pref_util.js"
328 type="chrome_html" /> 336 type="chrome_html" />
329 <structure name="IDR_SETTINGS_PREFS_HTML" 337 <structure name="IDR_SETTINGS_PREFS_HTML"
330 file="prefs/prefs.html" 338 file="prefs/prefs.html"
331 type="chrome_html" /> 339 type="chrome_html" />
332 <structure name="IDR_SETTINGS_PREFS_JS" 340 <structure name="IDR_SETTINGS_PREFS_JS"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 file="search_page/search_page.js" 479 file="search_page/search_page.js"
472 type="chrome_html" /> 480 type="chrome_html" />
473 <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML" 481 <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML"
474 file="search_page/search_page.html" 482 file="search_page/search_page.html"
475 type="chrome_html" 483 type="chrome_html"
476 flattenhtml="true" 484 flattenhtml="true"
477 allowexternalscript="true" /> 485 allowexternalscript="true" />
478 <structure name="IDR_SETTINGS_SEARCH_PAGE_CSS" 486 <structure name="IDR_SETTINGS_SEARCH_PAGE_CSS"
479 file="search_page/search_page.css" 487 file="search_page/search_page.css"
480 type="chrome_html" /> 488 type="chrome_html" />
481 <if expr="not chromeos">
482 <structure name="IDR_SETTINGS_SIGNIN_PAGE_JS"
483 file="signin_page/signin_page.js"
484 type="chrome_html" />
485 <structure name="IDR_SETTINGS_SIGNIN_PAGE_HTML"
486 file="signin_page/signin_page.html"
487 type="chrome_html"
488 flattenhtml="true"
489 allowexternalscript="true" />
490 </if>
491 <structure name="IDR_SETTINGS_SYNC_PAGE_JS" 489 <structure name="IDR_SETTINGS_SYNC_PAGE_JS"
492 file="sync_page/sync_page.js" 490 file="people_page/sync_page.js"
493 type="chrome_html" /> 491 type="chrome_html" />
494 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML" 492 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML"
495 file="sync_page/sync_page.html" 493 file="people_page/sync_page.html"
496 type="chrome_html" 494 type="chrome_html"
497 flattenhtml="true" 495 flattenhtml="true"
498 allowexternalscript="true" /> 496 allowexternalscript="true" />
499 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS" 497 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS"
500 file="sync_page/sync_page.css" 498 file="people_page/sync_page.css"
501 type="chrome_html" /> 499 type="chrome_html" />
502 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS" 500 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS"
503 file="sync_page/sync_private_api.js" 501 file="people_page/sync_private_api.js"
504 type="chrome_html" /> 502 type="chrome_html" />
505 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML" 503 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML"
506 file="sync_page/sync_private_api.html" 504 file="people_page/sync_private_api.html"
507 type="chrome_html" 505 type="chrome_html"
508 flattenhtml="true" 506 flattenhtml="true"
509 allowexternalscript="true" /> 507 allowexternalscript="true" />
510 <structure name="IDR_SETTINGS_SETTINGS_HTML" 508 <structure name="IDR_SETTINGS_SETTINGS_HTML"
511 file="settings.html" 509 file="settings.html"
512 type="chrome_html" /> 510 type="chrome_html" />
513 <structure name="IDR_SETTINGS_SETTINGS_JS" 511 <structure name="IDR_SETTINGS_SETTINGS_JS"
514 file="settings.js" 512 file="settings.js"
515 type="chrome_html" /> 513 type="chrome_html" />
516 <if expr="chromeos"> 514 <if expr="chromeos">
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 type="chrome_html" 660 type="chrome_html"
663 flattenhtml="true" 661 flattenhtml="true"
664 allowexternalscript="true" /> 662 allowexternalscript="true" />
665 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 663 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
666 file="users_page/users_page.css" 664 file="users_page/users_page.css"
667 type="chrome_html" /> 665 type="chrome_html" />
668 </if> 666 </if>
669 </structures> 667 </structures>
670 </release> 668 </release>
671 </grit> 669 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_menu/settings_menu.html ('k') | chrome/browser/resources/settings/signin_page/signin_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698