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

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

Issue 6364009: From the enter-passphrase screen in sync setup, canceling should only disable... (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
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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 AddString(dict, "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE); 179 AddString(dict, "enterPassphraseTitle", IDS_SYNC_ENTER_PASSPHRASE_TITLE);
180 AddString(dict, "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY); 180 AddString(dict, "enterPassphraseBody", IDS_SYNC_ENTER_PASSPHRASE_BODY);
181 AddString(dict, "enterOtherPassphraseBody", 181 AddString(dict, "enterOtherPassphraseBody",
182 IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY); 182 IDS_SYNC_ENTER_OTHER_PASSPHRASE_BODY);
183 AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL); 183 AddString(dict, "passphraseLabel", IDS_SYNC_PASSPHRASE_LABEL);
184 AddString(dict, "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE); 184 AddString(dict, "incorrectPassphrase", IDS_SYNC_INCORRECT_PASSPHRASE);
185 AddString(dict, "passphraseRecover", IDS_SYNC_PASSPHRASE_RECOVER); 185 AddString(dict, "passphraseRecover", IDS_SYNC_PASSPHRASE_RECOVER);
186 AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING); 186 AddString(dict, "passphraseWarning", IDS_SYNC_PASSPHRASE_WARNING);
187 AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK); 187 AddString(dict, "cleardatalink", IDS_SYNC_CLEAR_DATA_LINK);
188 188
189 AddString(dict, "cancelWarningHeader",
190 IDS_SYNC_PASSPHRASE_CANCEL_WARNING_HEADER);
191 AddString(dict, "cancelWarning", IDS_SYNC_PASSPHRASE_CANCEL_WARNING);
192 AddString(dict, "yes", IDS_SYNC_PASSPHRASE_CANCEL_YES);
193 AddString(dict, "no", IDS_SYNC_PASSPHRASE_CANCEL_NO);
194
189 AddString(dict, "ok", IDS_OK); 195 AddString(dict, "ok", IDS_OK);
190 AddString(dict, "cancel", IDS_CANCEL); 196 AddString(dict, "cancel", IDS_CANCEL);
191 } else if (path_raw == kSyncFirstPassphrasePath) { 197 } else if (path_raw == kSyncFirstPassphrasePath) {
192 html_resource_id = IDR_SYNC_FIRST_PASSPHRASE_HTML; 198 html_resource_id = IDR_SYNC_FIRST_PASSPHRASE_HTML;
193 AddString(dict, "title", IDS_SYNC_FIRST_PASSPHRASE_TITLE); 199 AddString(dict, "title", IDS_SYNC_FIRST_PASSPHRASE_TITLE);
194 dict->SetString("instructions", 200 dict->SetString("instructions",
195 GetStringFUTF16(IDS_SYNC_FIRST_PASSPHRASE_MESSAGE, 201 GetStringFUTF16(IDS_SYNC_FIRST_PASSPHRASE_MESSAGE,
196 GetStringUTF16(IDS_PRODUCT_NAME))); 202 GetStringUTF16(IDS_PRODUCT_NAME)));
197 AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE); 203 AddString(dict, "googleOption", IDS_SYNC_PASSPHRASE_OPT_GOOGLE);
198 AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT); 204 AddString(dict, "explicitOption", IDS_SYNC_PASSPHRASE_OPT_EXPLICIT);
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 result = GAIA_SUCCESS; 332 result = GAIA_SUCCESS;
327 } else if (start_state == ENTER_PASSPHRASE || 333 } else if (start_state == ENTER_PASSPHRASE ||
328 start_state == CONFIGURE || 334 start_state == CONFIGURE ||
329 start_state == PASSPHRASE_MIGRATION) { 335 start_state == PASSPHRASE_MIGRATION) {
330 result = DONE; 336 result = DONE;
331 } 337 }
332 DCHECK_NE(FATAL_ERROR, result) << 338 DCHECK_NE(FATAL_ERROR, result) <<
333 "Invalid start state for discrete run: " << start_state; 339 "Invalid start state for discrete run: " << start_state;
334 return result; 340 return result;
335 } 341 }
OLDNEW
« chrome/browser/sync/sync_setup_flow.cc ('K') | « chrome/browser/sync/sync_setup_flow.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698