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

Side by Side Diff: chrome/browser/sync/sync_setup_wizard.cc

Issue 6353013: Bring the first passphrase screen UI up to date with equivalent changes made ... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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/resources/firstpassphrase.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 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/sync_setup_wizard.h" 5 #include "chrome/browser/sync/sync_setup_wizard.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/singleton.h" 8 #include "base/singleton.h"
9 #include "chrome/browser/browser_thread.h" 9 #include "chrome/browser/browser_thread.h"
10 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 10 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE); 197 AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE);
198 AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT); 198 AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT);
199 AddString(dict, "nothanksOption", IDS_SYNC_PASSPHRASE_OPT_CANCEL); 199 AddString(dict, "nothanksOption", IDS_SYNC_PASSPHRASE_OPT_CANCEL);
200 AddString(dict, "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE); 200 AddString(dict, "sectionGoogleMessage", IDS_SYNC_PASSPHRASE_MSG_GOOGLE);
201 AddString(dict, "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT); 201 AddString(dict, "sectionExplicitMessage", IDS_SYNC_PASSPHRASE_MSG_EXPLICIT);
202 AddString(dict, "sectionNothanksMessage", IDS_SYNC_PASSPHRASE_MSG_CANCEL); 202 AddString(dict, "sectionNothanksMessage", IDS_SYNC_PASSPHRASE_MSG_CANCEL);
203 AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL); 203 AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
204 AddString(dict, "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL); 204 AddString(dict, "confirmLabel", IDS_SYNC_CONFIRM_PASSPHRASE_LABEL);
205 AddString(dict, "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR); 205 AddString(dict, "emptyErrorMessage", IDS_SYNC_EMPTY_PASSPHRASE_ERROR);
206 AddString(dict, "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR); 206 AddString(dict, "mismatchErrorMessage", IDS_SYNC_PASSPHRASE_MISMATCH_ERROR);
207
208 AddString(dict, "learnmore", IDS_LEARN_MORE);
209 dict->SetString("encryptionhelpurl",
210 GetLocalizedUrl(kEncryptionHelpUrl));
211
207 AddString(dict, "ok", IDS_OK); 212 AddString(dict, "ok", IDS_OK);
208 AddString(dict, "cancel", IDS_CANCEL); 213 AddString(dict, "cancel", IDS_CANCEL);
209 } else if (path_raw == kSyncSettingUpPath) { 214 } else if (path_raw == kSyncSettingUpPath) {
210 html_resource_id = IDR_SYNC_SETTING_UP_HTML; 215 html_resource_id = IDR_SYNC_SETTING_UP_HTML;
211 216
212 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP); 217 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP);
213 AddString(dict, "cancel", IDS_CANCEL); 218 AddString(dict, "cancel", IDS_CANCEL);
214 } else if (path_raw == kSyncSetupDonePath) { 219 } else if (path_raw == kSyncSetupDonePath) {
215 html_resource_id = IDR_SYNC_SETUP_DONE_HTML; 220 html_resource_id = IDR_SYNC_SETUP_DONE_HTML;
216 221
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 result = GAIA_SUCCESS; 326 result = GAIA_SUCCESS;
322 } else if (start_state == ENTER_PASSPHRASE || 327 } else if (start_state == ENTER_PASSPHRASE ||
323 start_state == CONFIGURE || 328 start_state == CONFIGURE ||
324 start_state == PASSPHRASE_MIGRATION) { 329 start_state == PASSPHRASE_MIGRATION) {
325 result = DONE; 330 result = DONE;
326 } 331 }
327 DCHECK_NE(FATAL_ERROR, result) << 332 DCHECK_NE(FATAL_ERROR, result) <<
328 "Invalid start state for discrete run: " << start_state; 333 "Invalid start state for discrete run: " << start_state;
329 return result; 334 return result;
330 } 335 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/resources/firstpassphrase.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698