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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/sync/resources/configure.html

Issue 8334030: Merge search engines sync data type with Preferences. Sync the default search provider. Add some ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Merge to TOT and fixed additional conflicts from rsimha. Created 9 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_impl_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <html i18n-values="dir:textdirection;"> 1 <html i18n-values="dir:textdirection;">
2 <head> 2 <head>
3 <title></title> 3 <title></title>
4 <style type="text/css"> 4 <style type="text/css">
5 body { 5 body {
6 6
7 } 7 }
8 body { 8 body {
9 9
10 } 10 }
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 } else { 353 } else {
354 document.getElementById("omniboxItem").className = "sync-item-hide"; 354 document.getElementById("omniboxItem").className = "sync-item-hide";
355 } 355 }
356 if (args.appsRegistered) { 356 if (args.appsRegistered) {
357 document.getElementById("appsCheckbox").checked = 357 document.getElementById("appsCheckbox").checked =
358 args.syncApps; 358 args.syncApps;
359 document.getElementById("appsItem").className = "sync-item-show"; 359 document.getElementById("appsItem").className = "sync-item-show";
360 } else { 360 } else {
361 document.getElementById("appsItem").className = "sync-item-hide"; 361 document.getElementById("appsItem").className = "sync-item-hide";
362 } 362 }
363 if (args.searchEnginesRegistered) {
364 document.getElementById("searchEnginesCheckbox").checked =
365 args.syncSearchEngines;
366 document.getElementById("searchEnginesItem").className = "sync-item-show";
367 } else {
368 document.getElementById("searchEnginesItem").className = "sync-item-hide";
369 }
370 if (args.sessionsRegistered) { 363 if (args.sessionsRegistered) {
371 document.getElementById("sessionsCheckbox").checked = args.syncSessions; 364 document.getElementById("sessionsCheckbox").checked = args.syncSessions;
372 document.getElementById("sessionsItem").className = "sync-item-show"; 365 document.getElementById("sessionsItem").className = "sync-item-show";
373 } else { 366 } else {
374 document.getElementById("sessionsItem").className = "sync-item-hide"; 367 document.getElementById("sessionsItem").className = "sync-item-hide";
375 } 368 }
376 369
377 setCheckboxesToKeepEverythingSynced(args.syncAllDataTypes); 370 setCheckboxesToKeepEverythingSynced(args.syncAllDataTypes);
378 } 371 }
379 372
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 var result = JSON.stringify({ 449 var result = JSON.stringify({
457 "syncAllDataTypes": syncAll, 450 "syncAllDataTypes": syncAll,
458 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked, 451 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked,
459 "syncPreferences": syncAll || f.preferencesCheckbox.checked, 452 "syncPreferences": syncAll || f.preferencesCheckbox.checked,
460 "syncThemes": syncAll || f.themesCheckbox.checked, 453 "syncThemes": syncAll || f.themesCheckbox.checked,
461 "syncPasswords": syncAll || f.passwordsCheckbox.checked, 454 "syncPasswords": syncAll || f.passwordsCheckbox.checked,
462 "syncAutofill": syncAll || f.autofillCheckbox.checked, 455 "syncAutofill": syncAll || f.autofillCheckbox.checked,
463 "syncExtensions": syncAll || f.extensionsCheckbox.checked, 456 "syncExtensions": syncAll || f.extensionsCheckbox.checked,
464 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked, 457 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
465 "syncApps": syncAll || f.appsCheckbox.checked, 458 "syncApps": syncAll || f.appsCheckbox.checked,
466 "syncSearchEngines": syncAll || f.searchEnginesCheckbox.checked,
467 "syncSessions": syncAll || f.sessionsCheckbox.checked, 459 "syncSessions": syncAll || f.sessionsCheckbox.checked,
468 "usePassphrase": (getRadioCheckedValue() == 'explicit'), 460 "usePassphrase": (getRadioCheckedValue() == 'explicit'),
469 "passphrase": f.passphrase.value 461 "passphrase": f.passphrase.value
470 }); 462 });
471 chrome.send("Configure", [result]); 463 chrome.send("Configure", [result]);
472 } 464 }
473 465
474 function switchToMode(mode) { 466 function switchToMode(mode) {
475 if (mode == "google") 467 if (mode == "google")
476 document.getElementById("sync-custom-passphrase").hidden = true; 468 document.getElementById("sync-custom-passphrase").hidden = true;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox" 604 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox"
613 i18n-content="themes" i18n-values="title:themes"></label> 605 i18n-content="themes" i18n-values="title:themes"></label>
614 </div> 606 </div>
615 <!-- Sessions --> 607 <!-- Sessions -->
616 <div class="sync-item-show" id="sessionsItem"> 608 <div class="sync-item-show" id="sessionsItem">
617 <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbo x"> 609 <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbo x">
618 <label id="sessionsCheckboxLabel" name="dataTypeLabel" 610 <label id="sessionsCheckboxLabel" name="dataTypeLabel"
619 for="sessionsCheckbox" i18n-content="foreignsessions" 611 for="sessionsCheckbox" i18n-content="foreignsessions"
620 il8n-values="title:sessions"></label> 612 il8n-values="title:sessions"></label>
621 </div> 613 </div>
622 <!-- Search Engines -->
623 <div class="sync-item-show" id="searchEnginesItem">
624 <input id="searchEnginesCheckbox" name="dataTypeCheckbox" type="ch eckbox">
625 <label id="searchEnginesCheckboxLabel" name="dataTypeLabel"
626 for="searchEnginesCheckbox" i18n-content="searchengines"
627 il8n-values="title:searchengines"></label>
628 </div>
629 </div> 614 </div>
630 </div> 615 </div>
631 </div> 616 </div>
632 <div class="sync-errors"> 617 <div class="sync-errors">
633 <span id="error-text" i18n-content="synczerodatatypeserror" 618 <span id="error-text" i18n-content="synczerodatatypeserror"
634 class="sync-error-hide"></span> 619 class="sync-error-hide"></span>
635 <span id="aborted-text" i18n-content="abortederror" 620 <span id="aborted-text" i18n-content="abortederror"
636 class="sync-error-hide"></span> 621 class="sync-error-hide"></span>
637 </div> 622 </div>
638 <hr> 623 <hr>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
678 </div> 663 </div>
679 <input id="okButton" type="submit" i18n-values="value:ok" /> 664 <input id="okButton" type="submit" i18n-values="value:ok" />
680 <input id="cancelButton" type="button" i18n-values="value:cancel" 665 <input id="cancelButton" type="button" i18n-values="value:cancel"
681 onclick='chrome.send("DialogClose", [""])' /> 666 onclick='chrome.send("DialogClose", [""])' />
682 </div> 667 </div>
683 </div> 668 </div>
684 </form> 669 </form>
685 </div> 670 </div>
686 </body> 671 </body>
687 </html> 672 </html>
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_factory_impl_unittest.cc ('k') | chrome/browser/sync/sync_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698