summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 18:48:20 +0000
committerzea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-21 18:48:20 +0000
commit97ef449330a14ef8873a98adebddcc89446126d0 (patch)
tree8b351ce8ec2ee079c6c01ff6712a8a21aee59e91 /chrome/browser/sync
parent3dd5198556343e2f5ef1192ffe636a09d831d2fe (diff)
downloadchromium_src-97ef449330a14ef8873a98adebddcc89446126d0.zip
chromium_src-97ef449330a14ef8873a98adebddcc89446126d0.tar.gz
chromium_src-97ef449330a14ef8873a98adebddcc89446126d0.tar.bz2
UI changes to support syncing foreign sessions. Changes were largely made to the sync options and new tab page.
BUG=30519 TEST=None Review URL: http://codereview.chromium.org/3767009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/resources/configure.html14
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/sync/resources/configure.html b/chrome/browser/sync/resources/configure.html
index e7e6137..0ba65c4 100644
--- a/chrome/browser/sync/resources/configure.html
+++ b/chrome/browser/sync/resources/configure.html
@@ -254,6 +254,12 @@ html[os='mac'] input[type='submit'] {
}
setCheckboxesToKeepEverythingSynced(args.keepEverythingSynced);
+ if (args.sessionsRegistered) {
+ document.getElementById("sessionsCheckbox").checked = args.syncSessions;
+ document.getElementById("sessionsItem").className = "sync-item-show";
+ } else {
+ document.getElementById("sessionsItem").className = "sync-item-hide";
+ }
}
function setEncryptionCheckboxes(args) {
@@ -330,6 +336,7 @@ html[os='mac'] input[type='submit'] {
"syncExtensions": syncAll || f.extensionsCheckbox.checked,
"syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked,
"syncApps": syncAll || f.appsCheckbox.checked,
+ "syncSessions": syncAll || f.sessionsCheckbox.checked,
"usePassphrase": document.getElementById("usePassphraseCheckbox").checked
});
chrome.send("Configure", [result]);
@@ -443,6 +450,13 @@ html[os='mac'] input[type='submit'] {
<label id="themesCheckboxLabel" name="dataTypeLabel" for="themesCheckbox"
i18n-content="themes" i18n-values="title:themes"></label>
</div>
+ <!-- Sessions -->
+ <div class="sync-item-show" id="sessionsItem">
+ <input id="sessionsCheckbox" name="dataTypeCheckbox" type="checkbox">
+ <label id="sessionsCheckboxLabel" name="dataTypeLabel"
+ for="sessionsCheckbox" i18n-content="foreignsessions"
+ il8n-values="title:sessions"></label>
+ </div>
</div>
</div>
</div>