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

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: fix an egreious git cl format error 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') | chrome/browser/ui/webui/settings/people_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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS" 304 <structure name="IDR_SETTINGS_LANGUAGES_EDIT_DICTIONARY_PAGE_JS"
305 file="languages_page/edit_dictionary_page.js" 305 file="languages_page/edit_dictionary_page.js"
306 type="chrome_html" /> 306 type="chrome_html" />
307 </if> 307 </if>
308 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML" 308 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_HTML"
309 file="passwords_and_forms_page/passwords_and_forms_page.html" 309 file="passwords_and_forms_page/passwords_and_forms_page.html"
310 type="chrome_html" /> 310 type="chrome_html" />
311 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS" 311 <structure name="IDR_SETTINGS_PASSWORDS_AND_FORMS_PAGE_JS"
312 file="passwords_and_forms_page/passwords_and_forms_page.js" 312 file="passwords_and_forms_page/passwords_and_forms_page.js"
313 type="chrome_html" /> 313 type="chrome_html" />
314 <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
315 file="people_page/people_page.js"
316 type="chrome_html" />
317 <structure name="IDR_SETTINGS_PEOPLE_PAGE_HTML"
318 file="people_page/people_page.html"
319 type="chrome_html"
320 flattenhtml="true"
321 allowexternalscript="true" />
314 <structure name="IDR_SETTINGS_PREF_UTIL_HTML" 322 <structure name="IDR_SETTINGS_PREF_UTIL_HTML"
315 file="prefs/pref_util.html" 323 file="prefs/pref_util.html"
316 type="chrome_html" /> 324 type="chrome_html" />
317 <structure name="IDR_SETTINGS_PREF_UTIL_JS" 325 <structure name="IDR_SETTINGS_PREF_UTIL_JS"
318 file="prefs/pref_util.js" 326 file="prefs/pref_util.js"
319 type="chrome_html" /> 327 type="chrome_html" />
320 <structure name="IDR_SETTINGS_PREFS_HTML" 328 <structure name="IDR_SETTINGS_PREFS_HTML"
321 file="prefs/prefs.html" 329 file="prefs/prefs.html"
322 type="chrome_html" /> 330 type="chrome_html" />
323 <structure name="IDR_SETTINGS_PREFS_JS" 331 <structure name="IDR_SETTINGS_PREFS_JS"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 file="search_page/search_page.js" 470 file="search_page/search_page.js"
463 type="chrome_html" /> 471 type="chrome_html" />
464 <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML" 472 <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML"
465 file="search_page/search_page.html" 473 file="search_page/search_page.html"
466 type="chrome_html" 474 type="chrome_html"
467 flattenhtml="true" 475 flattenhtml="true"
468 allowexternalscript="true" /> 476 allowexternalscript="true" />
469 <structure name="IDR_SETTINGS_SEARCH_PAGE_CSS" 477 <structure name="IDR_SETTINGS_SEARCH_PAGE_CSS"
470 file="search_page/search_page.css" 478 file="search_page/search_page.css"
471 type="chrome_html" /> 479 type="chrome_html" />
472 <if expr="not chromeos">
473 <structure name="IDR_SETTINGS_SIGNIN_PAGE_JS"
474 file="signin_page/signin_page.js"
475 type="chrome_html" />
476 <structure name="IDR_SETTINGS_SIGNIN_PAGE_HTML"
477 file="signin_page/signin_page.html"
478 type="chrome_html"
479 flattenhtml="true"
480 allowexternalscript="true" />
481 </if>
482 <structure name="IDR_SETTINGS_SYNC_PAGE_JS" 480 <structure name="IDR_SETTINGS_SYNC_PAGE_JS"
483 file="sync_page/sync_page.js" 481 file="people_page/sync_page.js"
484 type="chrome_html" /> 482 type="chrome_html" />
485 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML" 483 <structure name="IDR_SETTINGS_SYNC_PAGE_HTML"
486 file="sync_page/sync_page.html" 484 file="people_page/sync_page.html"
487 type="chrome_html" 485 type="chrome_html"
488 flattenhtml="true" 486 flattenhtml="true"
489 allowexternalscript="true" /> 487 allowexternalscript="true" />
490 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS" 488 <structure name="IDR_SETTINGS_SYNC_PAGE_CSS"
491 file="sync_page/sync_page.css" 489 file="people_page/sync_page.css"
492 type="chrome_html" /> 490 type="chrome_html" />
493 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS" 491 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_JS"
494 file="sync_page/sync_private_api.js" 492 file="people_page/sync_private_api.js"
495 type="chrome_html" /> 493 type="chrome_html" />
496 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML" 494 <structure name="IDR_SETTINGS_SYNC_PRIVATE_API_HTML"
497 file="sync_page/sync_private_api.html" 495 file="people_page/sync_private_api.html"
498 type="chrome_html" 496 type="chrome_html"
499 flattenhtml="true" 497 flattenhtml="true"
500 allowexternalscript="true" /> 498 allowexternalscript="true" />
501 <structure name="IDR_SETTINGS_SETTINGS_HTML" 499 <structure name="IDR_SETTINGS_SETTINGS_HTML"
502 file="settings.html" 500 file="settings.html"
503 type="chrome_html" /> 501 type="chrome_html" />
504 <structure name="IDR_SETTINGS_SETTINGS_JS" 502 <structure name="IDR_SETTINGS_SETTINGS_JS"
505 file="settings.js" 503 file="settings.js"
506 type="chrome_html" /> 504 type="chrome_html" />
507 <if expr="chromeos"> 505 <if expr="chromeos">
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 type="chrome_html" 651 type="chrome_html"
654 flattenhtml="true" 652 flattenhtml="true"
655 allowexternalscript="true" /> 653 allowexternalscript="true" />
656 <structure name="IDR_SETTINGS_USERS_PAGE_CSS" 654 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"
657 file="users_page/users_page.css" 655 file="users_page/users_page.css"
658 type="chrome_html" /> 656 type="chrome_html" />
659 </if> 657 </if>
660 </structures> 658 </structures>
661 </release> 659 </release>
662 </grit> 660 </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') | chrome/browser/ui/webui/settings/people_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698