OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/singleton.h" | 9 #include "base/singleton.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 localized_strings.SetString(L"createaccount", | 78 localized_strings.SetString(L"createaccount", |
79 l10n_util::GetString(IDS_SYNC_CREATE_ACCOUNT)); | 79 l10n_util::GetString(IDS_SYNC_CREATE_ACCOUNT)); |
80 localized_strings.SetString(L"cancel", | 80 localized_strings.SetString(L"cancel", |
81 l10n_util::GetString(IDS_CANCEL)); | 81 l10n_util::GetString(IDS_CANCEL)); |
82 localized_strings.SetString(L"settingup", | 82 localized_strings.SetString(L"settingup", |
83 l10n_util::GetString(IDS_SYNC_LOGIN_SETTING_UP)); | 83 l10n_util::GetString(IDS_SYNC_LOGIN_SETTING_UP)); |
84 localized_strings.SetString(L"success", | 84 localized_strings.SetString(L"success", |
85 l10n_util::GetString(IDS_SYNC_SUCCESS)); | 85 l10n_util::GetString(IDS_SYNC_SUCCESS)); |
86 localized_strings.SetString(L"errorsigningin", | 86 localized_strings.SetString(L"errorsigningin", |
87 l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN)); | 87 l10n_util::GetString(IDS_SYNC_ERROR_SIGNING_IN)); |
| 88 localized_strings.SetString(L"captchainstructions", |
| 89 l10n_util::GetString(IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS)); |
88 static const base::StringPiece html(ResourceBundle::GetSharedInstance() | 90 static const base::StringPiece html(ResourceBundle::GetSharedInstance() |
89 .GetRawDataResource(IDR_GAIA_LOGIN_HTML)); | 91 .GetRawDataResource(IDR_GAIA_LOGIN_HTML)); |
90 SetFontAndTextDirection(&localized_strings); | 92 SetFontAndTextDirection(&localized_strings); |
91 response = jstemplate_builder::GetI18nTemplateHtml( | 93 response = jstemplate_builder::GetI18nTemplateHtml( |
92 html, &localized_strings); | 94 html, &localized_strings); |
93 } else if (path_raw == chrome::kSyncMergeAndSyncPath) { | 95 } else if (path_raw == chrome::kSyncMergeAndSyncPath) { |
94 DictionaryValue localized_strings; | 96 DictionaryValue localized_strings; |
95 localized_strings.SetString(L"introduction", | 97 localized_strings.SetString(L"introduction", |
96 l10n_util::GetString(IDS_SYNC_MERGE_INTRODUCTION)); | 98 l10n_util::GetString(IDS_SYNC_MERGE_INTRODUCTION)); |
97 localized_strings.SetString(L"mergeandsynclabel", | 99 localized_strings.SetString(L"mergeandsynclabel", |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 } | 194 } |
193 | 195 |
194 // static | 196 // static |
195 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun( | 197 SyncSetupWizard::State SyncSetupWizard::GetEndStateForDiscreteRun( |
196 State start_state) { | 198 State start_state) { |
197 State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE; | 199 State result = start_state == GAIA_LOGIN ? GAIA_SUCCESS : DONE; |
198 DCHECK_NE(DONE, result) << | 200 DCHECK_NE(DONE, result) << |
199 "Invalid start state for discrete run: " << start_state; | 201 "Invalid start state for discrete run: " << start_state; |
200 return result; | 202 return result; |
201 } | 203 } |
OLD | NEW |