summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-29 00:17:53 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-29 00:17:53 +0000
commitc4408f0c95c17bc9ff77f523252515c5fc056532 (patch)
tree736d515ab2c39049147639562db0c7c15543f7e7
parente83aad11a5dbfdf7ed7fc077ee9f8d9c50de2863 (diff)
downloadchromium_src-c4408f0c95c17bc9ff77f523252515c5fc056532.zip
chromium_src-c4408f0c95c17bc9ff77f523252515c5fc056532.tar.gz
chromium_src-c4408f0c95c17bc9ff77f523252515c5fc056532.tar.bz2
Merge 73044 - Change the initial passphrase screen to match the new mocks.
BUG=71107 TEST=upgrade scenario for a "sync everything" user, click NTP promo. Review URL: http://codereview.chromium.org/6377014 TBR=johnnyg@chromium.org Review URL: http://codereview.chromium.org/6270010 git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@73045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--chrome/app/generated_resources.grd8
-rw-r--r--chrome/browser/sync/resources/firstpassphrase.html30
-rw-r--r--chrome/browser/sync/sync_setup_wizard.cc6
3 files changed, 20 insertions, 24 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 26bcc88..cdf7355 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -8170,11 +8170,17 @@ Keep your key file in a safe place. You will need it to create new versions of y
<ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> can now sync your passwords. To protect your data, you need to confirm your account information.
</message>
<message name="IDS_SYNC_FIRST_PASSPHRASE_TITLE" desc="Title for dialog setting up first passphrase.">
- Set up encrypted sync
+ Sync your passwords
</message>
<message name="IDS_SYNC_FIRST_PASSPHRASE_MESSAGE" desc="Message for setting up first passphrase.">
<ph name="PRODUCT_NAME">$1<ex>Chrome</ex></ph> can now sync your passwords; your data will be encrypted with your Google Account password or a passphrase of your choosing.
</message>
+ <message name="IDS_SYNC_FIRST_PASSPHRASE_OK" desc="Message to confirm the passphrase setup.">
+ Sync passwords
+ </message>
+ <message name="IDS_SYNC_FIRST_PASSPHRASE_CANCEL" desc="Message to opt out of the passphrase setup and password sync">
+ No thanks
+ </message>
<message name="IDS_SYNC_PASSPHRASE_OPT_GOOGLE" desc="Radio button label for using Google password.">
Use my Google Account password
</message>
diff --git a/chrome/browser/sync/resources/firstpassphrase.html b/chrome/browser/sync/resources/firstpassphrase.html
index 4f82ef9..bf3c302 100644
--- a/chrome/browser/sync/resources/firstpassphrase.html
+++ b/chrome/browser/sync/resources/firstpassphrase.html
@@ -49,6 +49,7 @@ input[type='button'],
input[type='submit'] {
min-width: 87px;
min-height: 26px;
+ margin-left: 7px;
}
html[os='mac'] input[type='button'],
html[os='mac'] input[type='submit'] {
@@ -87,15 +88,9 @@ html[os='mac'] input[type='submit'] {
function switchToMode(mode) {
document.getElementById("section-explicit").style.display = "none";
- document.getElementById("section-nothanks").style.display = "none";
- document.getElementById("section-google").style.display = "none";
- if (mode == "google") {
- document.getElementById("section-google").style.display = "block";
- } else if (mode =="explicit") {
+ if (mode == "explicit") {
document.getElementById("section-explicit").style.display = "block";
- } else if (mode == "nothanks") {
- document.getElementById("section-nothanks").style.display = "block";
}
}
@@ -145,6 +140,12 @@ html[os='mac'] input[type='submit'] {
"passphrase": f.passphrase.value});
chrome.send("FirstPassphrase", [result]);
}
+
+ function optOutOfPasswordsAndClose() {
+ var result = JSON.stringify({"option": "nothanks",
+ "passphrase": ""});
+ chrome.send("FirstPassphrase", [result]);
+ }
</script>
</head>
<body i18n-values=".style.fontFamily:fontfamily" onload="setupDialog();">
@@ -162,15 +163,7 @@ html[os='mac'] input[type='submit'] {
<span i18n-content="explicitOption"></span>
</input>
</div>
- <div>
- <input name="option" type="radio" value="nothanks" onchange="onRadioChange();">
- <span i18n-content="nothanksOption"></span>
- </input>
- </div>
- <div class="sync-section" id="section-google">
- <div i18n-content="sectionGoogleMessage"></div>
- </div>
<div class="sync-section" id="section-explicit">
<div i18n-content="sectionExplicitMessage"></div>
<div>
@@ -192,12 +185,11 @@ html[os='mac'] input[type='submit'] {
<div class="error" style="display:none"
id="mismatcherror" i18n-content="mismatchErrorMessage"></div>
</div>
- <div class="sync-section" id="section-nothanks">
- <div i18n-content="sectionNothanksMessage"></div>
- </div>
<div class="sync-footer">
- <input id="okButton" type="submit" i18n-values="value:ok" />
+ <input id="okButton" type="submit" i18n-values="value:syncpasswords" />
+ <input id="noThanksButton" type="submit" i18n-values="value:nothanks"
+ onclick="optOutOfPasswordsAndClose(); return false;"/>
</div>
</form>
</body>
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 3fc3de6..712c260 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -196,16 +196,14 @@ void SyncResourcesSource::StartDataRequest(const std::string& path_raw,
GetStringUTF16(IDS_PRODUCT_NAME)));
AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE);
AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT);
- AddString(dict, "nothanksOption", IDS_SYNC_PASSPHRASE_OPT_CANCEL);
AddString(dict, "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE);
AddString(dict, "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT);
- AddString(dict, "sectionNothanksMessage", IDS_SYNC_PASSPHRASE_MSG_CANCEL);
AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
AddString(dict, "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL);
AddString(dict, "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR);
AddString(dict, "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR);
- AddString(dict, "ok", IDS_OK);
- AddString(dict, "cancel", IDS_CANCEL);
+ AddString(dict, "syncpasswords", IDS_SYNC_FIRST_PASSPHRASE_OK);
+ AddString(dict, "nothanks", IDS_SYNC_FIRST_PASSPHRASE_CANCEL);
} else if (path_raw == kSyncSettingUpPath) {
html_resource_id = IDR_SYNC_SETTING_UP_HTML;
generated by cgit v1.1 at 2025-05-25 20:26:35 +0000