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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7669052: Added DataTypeController integration and UI surfacing for syncing Search Engines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed notification registration. Created 9 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/protocol/search_engine_specifics.proto ('k') | chrome/browser/sync/sync_setup_flow.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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 } else { 354 } else {
355 document.getElementById("omniboxItem").className = "sync-item-hide"; 355 document.getElementById("omniboxItem").className = "sync-item-hide";
356 } 356 }
357 if (args.appsRegistered) { 357 if (args.appsRegistered) {
358 document.getElementById("appsCheckbox").checked = 358 document.getElementById("appsCheckbox").checked =
359 args.syncApps; 359 args.syncApps;
360 document.getElementById("appsItem").className = "sync-item-show"; 360 document.getElementById("appsItem").className = "sync-item-show";
361 } else { 361 } else {
362 document.getElementById("appsItem").className = "sync-item-hide"; 362 document.getElementById("appsItem").className = "sync-item-hide";
363 } 363 }
364 364 if (args.searchEnginesRegistered) {
365 setCheckboxesToKeepEverythingSynced(args.keepEverythingSynced); 365 document.getElementById("searchEnginesCheckbox").checked =
366 args.syncSearchEngines;
367 document.getElementById("searchEnginesItem").className = "sync-item-show";
368 } else {
369 document.getElementById("searchEnginesItem").className = "sync-item-hide";
370 }
366 if (args.sessionsRegistered) { 371 if (args.sessionsRegistered) {
367 document.getElementById("sessionsCheckbox").checked = args.syncSessions; 372 document.getElementById("sessionsCheckbox").checked = args.syncSessions;
368 document.getElementById("sessionsItem").className = "sync-item-show"; 373 document.getElementById("sessionsItem").className = "sync-item-show";
369 } else { 374 } else {
370 document.getElementById("sessionsItem").className = "sync-item-hide"; 375 document.getElementById("sessionsItem").className = "sync-item-hide";
371 } 376 }
377
378 setCheckboxesToKeepEverythingSynced(args.keepEverythingSynced);
372 } 379 }
373 380
374 function setEncryptionCheckboxes(args) { 381 function setEncryptionCheckboxes(args) {
375 if (args["usePassphrase"]) { 382 if (args["usePassphrase"]) {
376 document.getElementById("explicit-option").checked = true; 383 document.getElementById("explicit-option").checked = true;
377 384
378 // The passphrase, once set, cannot be unset, but we show a reset link. 385 // The passphrase, once set, cannot be unset, but we show a reset link.
379 document.getElementById("explicit-option").disabled = true; 386 document.getElementById("explicit-option").disabled = true;
380 document.getElementById("google-option").disabled = true; 387 document.getElementById("google-option").disabled = true;
381 document.getElementById("sync-custom-passphrase").hidden = true; 388 document.getElementById("sync-custom-passphrase").hidden = true;
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 var result = JSON.stringify({ 457 var result = JSON.stringify({
451 "keepEverythingSynced": syncAll, 458 "keepEverythingSynced": syncAll,
452 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked, 459 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked,
453 "syncPreferences": syncAll || f.preferencesCheckbox.checked, 460 "syncPreferences": syncAll || f.preferencesCheckbox.checked,
454 "syncThemes": syncAll || f.themesCheckbox.checked, 461 "syncThemes": syncAll || f.themesCheckbox.checked,
455 "syncPasswords": syncAll || f.passwordsCheckbox.checked, 462 "syncPasswords": syncAll || f.passwordsCheckbox.checked,
456 "syncAutofill": syncAll || f.autofillCheckbox.checked, 463 "syncAutofill": syncAll || f.autofillCheckbox.checked,
457 "syncExtensions": syncAll || f.extensionsCheckbox.checked, 464 "syncExtensions": syncAll || f.extensionsCheckbox.checked,
458 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked, 465 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
459 "syncApps": syncAll || f.appsCheckbox.checked, 466 "syncApps": syncAll || f.appsCheckbox.checked,
467 "syncSearchEngines": syncAll || f.searchEnginesCheckbox.checked,
460 "syncSessions": syncAll || f.sessionsCheckbox.checked, 468 "syncSessions": syncAll || f.sessionsCheckbox.checked,
461 "usePassphrase": (getRadioCheckedValue() == 'explicit'), 469 "usePassphrase": (getRadioCheckedValue() == 'explicit'),
462 "passphrase": f.passphrase.value 470 "passphrase": f.passphrase.value
463 }); 471 });
464 chrome.send("Configure", [result]); 472 chrome.send("Configure", [result]);
465 } 473 }
466 474
467 function switchToMode(mode) { 475 function switchToMode(mode) {
468 if (mode == "google") 476 if (mode == "google")
469 document.getElementById("sync-custom-passphrase").hidden = true; 477 document.getElementById("sync-custom-passphrase").hidden = true;
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox" 613 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox"
606 i18n-content="themes" i18n-values="title:themes"></label> 614 i18n-content="themes" i18n-values="title:themes"></label>
607 </div> 615 </div>
608 <!-- Sessions --> 616 <!-- Sessions -->
609 <div class="sync-item-show" id="sessionsItem"> 617 <div class="sync-item-show" id="sessionsItem">
610 <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbo x"> 618 <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbo x">
611 <label id="sessionsCheckboxLabel" name="dataTypeLabel" 619 <label id="sessionsCheckboxLabel" name="dataTypeLabel"
612 for="sessionsCheckbox" i18n-content="foreignsessions" 620 for="sessionsCheckbox" i18n-content="foreignsessions"
613 il8n-values="title:sessions"></label> 621 il8n-values="title:sessions"></label>
614 </div> 622 </div>
623 <!-- Search Engines -->
624 <div class="sync-item-show" id="searchEnginesItem">
625 <input id="searchEnginesCheckbox" name="dataTypeCheckbox" type="ch eckbox">
626 <label id="searchEnginesCheckboxLabel" name="dataTypeLabel"
627 for="searchEnginesCheckbox" i18n-content="searchengines"
628 il8n-values="title:searchengines"></label>
629 </div>
615 </div> 630 </div>
616 </div> 631 </div>
617 </div> 632 </div>
618 <div class="sync-errors"> 633 <div class="sync-errors">
619 <span id="error-text" i18n-content="synczerodatatypeserror" 634 <span id="error-text" i18n-content="synczerodatatypeserror"
620 class="sync-error-hide"></span> 635 class="sync-error-hide"></span>
621 <span id="aborted-text" i18n-content="abortederror" 636 <span id="aborted-text" i18n-content="abortederror"
622 class="sync-error-hide"></span> 637 class="sync-error-hide"></span>
623 </div> 638 </div>
624 <hr> 639 <hr>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 </div> 679 </div>
665 <input id="okButton" type="submit" i18n-values="value:ok" /> 680 <input id="okButton" type="submit" i18n-values="value:ok" />
666 <input id="cancelButton" type="button" i18n-values="value:cancel" 681 <input id="cancelButton" type="button" i18n-values="value:cancel"
667 onclick='chrome.send("DialogClose", [""])' /> 682 onclick='chrome.send("DialogClose", [""])' />
668 </div> 683 </div>
669 </div> 684 </div>
670 </form> 685 </form>
671 </div> 686 </div>
672 </body> 687 </body>
673 </html> 688 </html>
OLDNEW
« no previous file with comments | « chrome/browser/sync/protocol/search_engine_specifics.proto ('k') | chrome/browser/sync/sync_setup_flow.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698