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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3767009: UI changes to support syncing foreign sessions. Changes were largely made to ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Rebased + comments Created 10 years, 2 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/resources/options/sync_options.html ('k') | no next file » | 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 line-height: 1.5em; 6 line-height: 1.5em;
7 background: #FFFFFF; 7 background: #FFFFFF;
8 font-size: 11pt; 8 font-size: 11pt;
9 } 9 }
10 html[os='mac'] body { 10 html[os='mac'] body {
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } else { 233 } else {
234 document.getElementById("omniboxItem").className = "sync-item-hide"; 234 document.getElementById("omniboxItem").className = "sync-item-hide";
235 } 235 }
236 if (args.appsRegistered) { 236 if (args.appsRegistered) {
237 document.getElementById("appsCheckbox").checked = 237 document.getElementById("appsCheckbox").checked =
238 args.syncApps; 238 args.syncApps;
239 document.getElementById("appsItem").className = "sync-item-show"; 239 document.getElementById("appsItem").className = "sync-item-show";
240 } else { 240 } else {
241 document.getElementById("appsItem").className = "sync-item-hide"; 241 document.getElementById("appsItem").className = "sync-item-hide";
242 } 242 }
243 if (args.sessionsRegistered) {
244 document.getElementById("sessionsCheckbox").checked = args.syncSessions;
245 document.getElementById("sessionsItem").className = "sync-item-show";
246 } else {
247 document.getElementById("sessionsItem").className = "sync-item-hide";
248 }
243 } 249 }
244 250
245 function setEncryptionCheckboxes(args) { 251 function setEncryptionCheckboxes(args) {
246 document.getElementById("usePassphraseCheckbox").checked = 252 document.getElementById("usePassphraseCheckbox").checked =
247 args["usePassphrase"]; 253 args["usePassphrase"];
248 254
249 // The passphrase, once set, cannot be unset. 255 // The passphrase, once set, cannot be unset.
250 if (args["usePassphrase"]) { 256 if (args["usePassphrase"]) {
251 document.getElementById("usePassphraseCheckbox").disabled = true; 257 document.getElementById("usePassphraseCheckbox").disabled = true;
252 } 258 }
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 var result = JSON.stringify({ 315 var result = JSON.stringify({
310 "keepEverythingSynced": syncAll, 316 "keepEverythingSynced": syncAll,
311 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked, 317 "syncBookmarks": syncAll || f.bookmarksCheckbox.checked,
312 "syncPreferences": syncAll || f.preferencesCheckbox.checked, 318 "syncPreferences": syncAll || f.preferencesCheckbox.checked,
313 "syncThemes": syncAll || f.themesCheckbox.checked, 319 "syncThemes": syncAll || f.themesCheckbox.checked,
314 "syncPasswords": syncAll || f.passwordsCheckbox.checked, 320 "syncPasswords": syncAll || f.passwordsCheckbox.checked,
315 "syncAutofill": syncAll || f.autofillCheckbox.checked, 321 "syncAutofill": syncAll || f.autofillCheckbox.checked,
316 "syncExtensions": syncAll || f.extensionsCheckbox.checked, 322 "syncExtensions": syncAll || f.extensionsCheckbox.checked,
317 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked, 323 "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
318 "syncApps": syncAll || f.appsCheckbox.checked, 324 "syncApps": syncAll || f.appsCheckbox.checked,
325 "syncSessions": syncAll || f.sessionsCheckbox.checked,
319 "usePassphrase": document.getElementById("usePassphraseCheckbox").checke d 326 "usePassphrase": document.getElementById("usePassphraseCheckbox").checke d
320 }); 327 });
321 chrome.send("Configure", [result]); 328 chrome.send("Configure", [result]);
322 } 329 }
323 330
324 function switchToTab(newTab) { 331 function switchToTab(newTab) {
325 if (currentTab) { 332 if (currentTab) {
326 document.getElementById(currentTab + "-tab").className = 333 document.getElementById(currentTab + "-tab").className =
327 "sync-config-tab-inactive"; 334 "sync-config-tab-inactive";
328 document.getElementById(currentTab + "-tab-contents").className = 335 document.getElementById(currentTab + "-tab-contents").className =
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 <label id="preferencesCheckboxLabel" name="dataTypeLabel" 429 <label id="preferencesCheckboxLabel" name="dataTypeLabel"
423 for="preferencesCheckbox" i18n-content="preferences" 430 for="preferencesCheckbox" i18n-content="preferences"
424 i18n-values="title:preferences"></label> 431 i18n-values="title:preferences"></label>
425 </div> 432 </div>
426 <!-- Themes --> 433 <!-- Themes -->
427 <div class="sync-item-show" id="themesItem"> 434 <div class="sync-item-show" id="themesItem">
428 <input id="themesCheckbox" name="dataTypeCheckbox" type="checkbox" > 435 <input id="themesCheckbox" name="dataTypeCheckbox" type="checkbox" >
429 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox" 436 <label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCh eckbox"
430 i18n-content="themes" i18n-values="title:themes"></label> 437 i18n-content="themes" i18n-values="title:themes"></label>
431 </div> 438 </div>
439 <!-- Sessions -->
440 <div class="sync-item-show" id="sessionsItem">
441 <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbo x">
442 <label id="sessionsCheckboxLabel" name="dataTypeLabel"
443 for="sessionsCheckbox" i18n-content="foreignsessions"
444 il8n-values="title:sessions"></label>
445 </div>
432 </div> 446 </div>
433 </div> 447 </div>
434 </div> 448 </div>
435 <div class="sync-errors"> 449 <div class="sync-errors">
436 <span id="error_text" i18n-content="synczerodatatypeserror" 450 <span id="error_text" i18n-content="synczerodatatypeserror"
437 class="sync-error-hide"></span> 451 class="sync-error-hide"></span>
438 <span id="aborted_text" i18n-content="abortederror" 452 <span id="aborted_text" i18n-content="abortederror"
439 class="sync-error-hide"></span> 453 class="sync-error-hide"></span>
440 </div> 454 </div>
441 </div> 455 </div>
(...skipping 16 matching lines...) Expand all
458 </div> 472 </div>
459 473
460 <div class="sync-footer"> 474 <div class="sync-footer">
461 <input id="okButton" type="submit" i18n-values="value:ok" /> 475 <input id="okButton" type="submit" i18n-values="value:ok" />
462 <input id="cancelButton" type="button" i18n-values="value:cancel" 476 <input id="cancelButton" type="button" i18n-values="value:cancel"
463 onclick='chrome.send("DialogClose", [""])' /> 477 onclick='chrome.send("DialogClose", [""])' />
464 </div> 478 </div>
465 </form> 479 </form>
466 </body> 480 </body>
467 </html> 481 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/sync_options.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698