Index: chrome/browser/sync/resources/choose_datatypes.html |
diff --git a/chrome/browser/sync/resources/choose_datatypes.html b/chrome/browser/sync/resources/choose_datatypes.html |
index e48675c523717bf6eaa709cd6ce9b11f7c28bae2..300dfd0b32c24d3bf401159f0c242259ab874b4c 100755 |
--- a/chrome/browser/sync/resources/choose_datatypes.html |
+++ b/chrome/browser/sync/resources/choose_datatypes.html |
@@ -102,6 +102,15 @@ input[type='submit'] { |
document.getElementById("extensionsCheckbox").style.display = "none"; |
document.getElementById("extensionsCheckboxLabel").style.display = "none"; |
} |
+ if (args.typedUrlsRegistered) { |
+ document.getElementById("typedUrlsCheckbox").checked = args.syncTypedUrls; |
+ document.getElementById("typedUrlsCheckbox").style.display = "inline"; |
+ document.getElementById("typedUrlsCheckboxLabel").style.display = |
+ "inline"; |
+ } else { |
+ document.getElementById("typedUrlsCheckbox").style.display = "none"; |
+ document.getElementById("typedUrlsCheckboxLabel").style.display = "none"; |
+ } |
} |
function setDataTypeCheckboxesEnabled(enabled) { |
@@ -111,6 +120,7 @@ input[type='submit'] { |
document.getElementById("passwordsCheckbox").disabled = !enabled; |
document.getElementById("autofillCheckbox").disabled = !enabled; |
document.getElementById("extensionsCheckbox").disabled = !enabled; |
+ document.getElementById("typedUrlsCheckbox").disabled = !enabled; |
} |
function advanceThrobber() { |
@@ -143,7 +153,8 @@ input[type='submit'] { |
"syncThemes": syncAll || f.themesCheckbox.checked, |
"syncPasswords": syncAll || f.passwordsCheckbox.checked, |
"syncAutofill": syncAll || f.autofillCheckbox.checked, |
- "syncExtensions": syncAll || f.extensionsCheckbox.checked |
+ "syncExtensions": syncAll || f.extensionsCheckbox.checked, |
+ "syncTypedUrls": syncAll || f.typedUrlsCheckbox.checked |
}); |
chrome.send("ChooseDataTypes", [result]); |
} |
@@ -178,8 +189,8 @@ input[type='submit'] { |
<label id="bookmarksCheckboxLabel" for="bookmarksCheckbox" i18n-content="bookmarks"></label> |
</td> |
<td> |
- <input id="passwordsCheckbox" type="checkbox"/> |
- <label id="passwordsCheckboxLabel" for="passwordsCheckbox" i18n-content="passwords"></label> |
+ <input id="autofillCheckbox" type="checkbox"/> |
+ <label id="autofillCheckboxLabel" for="autofillCheckbox" i18n-content="autofill"></label> |
</td> |
</tr> |
<tr> |
@@ -188,8 +199,8 @@ input[type='submit'] { |
<label id="preferencesCheckboxLabel" for="preferencesCheckbox" i18n-content="preferences"></label> |
</td> |
<td> |
- <input id="autofillCheckbox" type="checkbox"/> |
- <label id="autofillCheckboxLabel" for="autofillCheckbox" i18n-content="autofill"></label> |
+ <input id="extensionsCheckbox" type="checkbox"/> |
+ <label id="extensionsCheckboxLabel" for="extensionsCheckbox" i18n-content="extensions"></label> |
</td> |
</tr> |
<tr> |
@@ -198,8 +209,16 @@ input[type='submit'] { |
<label id="themesCheckboxLabel" for="themesCheckbox" i18n-content="themes"></label> |
</td> |
<td> |
- <input id="extensionsCheckbox" type="checkbox"/> |
- <label id="extensionsCheckboxLabel" for="extensionsCheckbox" i18n-content="extensions"></label> |
+ <input id="typedUrlsCheckbox" type="checkbox"/> |
+ <label id="typedUrlsCheckboxLabel" for="typedUrlsCheckbox" i18n-content="typedurls"></label> |
+ </td> |
+ </tr> |
+ <tr> |
+ <td> |
+ <input id="passwordsCheckbox" type="checkbox"/> |
+ <label id="passwordsCheckboxLabel" for="passwordsCheckbox" i18n-content="passwords"></label> |
+ </td> |
+ <td> |
</td> |
</tr> |
</table> |