| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/printing/cloud_print/cloud_print_setup_source.h" | 5 #include "chrome/browser/printing/cloud_print/cloud_print_setup_source.h" |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "chrome/browser/google/google_util.h" | 10 #include "chrome/browser/google/google_util.h" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 GetLocalizedUrl(kCanNotAccessAccountUrl)); | 75 GetLocalizedUrl(kCanNotAccessAccountUrl)); |
| 76 dict->SetString("createnewaccounturl", | 76 dict->SetString("createnewaccounturl", |
| 77 GetLocalizedUrl(kCreateNewAccountUrl)); | 77 GetLocalizedUrl(kCreateNewAccountUrl)); |
| 78 | 78 |
| 79 // None of the strings used here currently have sync-specific wording in | 79 // None of the strings used here currently have sync-specific wording in |
| 80 // them. There is a unit test to catch if that happens. | 80 // them. There is a unit test to catch if that happens. |
| 81 dict->SetString("introduction", ""); | 81 dict->SetString("introduction", ""); |
| 82 AddString(dict, "signinprefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX); | 82 AddString(dict, "signinprefix", IDS_SYNC_LOGIN_SIGNIN_PREFIX); |
| 83 AddString(dict, "signinsuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX); | 83 AddString(dict, "signinsuffix", IDS_SYNC_LOGIN_SIGNIN_SUFFIX); |
| 84 AddString(dict, "cannotbeblank", IDS_SYNC_CANNOT_BE_BLANK); | 84 AddString(dict, "cannotbeblank", IDS_SYNC_CANNOT_BE_BLANK); |
| 85 AddString(dict, "emaillabel", IDS_SYNC_LOGIN_EMAIL); | 85 AddString(dict, "emaillabel", IDS_SYNC_LOGIN_EMAIL_SAME_LINE); |
| 86 AddString(dict, "passwordlabel", IDS_SYNC_LOGIN_PASSWORD); | 86 AddString(dict, "passwordlabel", IDS_SYNC_LOGIN_PASSWORD_SAME_LINE); |
| 87 AddString(dict, "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS); | 87 AddString(dict, "invalidcredentials", IDS_SYNC_INVALID_USER_CREDENTIALS); |
| 88 AddString(dict, "signin", IDS_SYNC_SIGNIN); | 88 AddString(dict, "signin", IDS_SYNC_SIGNIN); |
| 89 AddString(dict, "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT); | 89 AddString(dict, "couldnotconnect", IDS_SYNC_LOGIN_COULD_NOT_CONNECT); |
| 90 AddString(dict, "cannotaccessaccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT); | 90 AddString(dict, "cannotaccessaccount", IDS_SYNC_CANNOT_ACCESS_ACCOUNT); |
| 91 AddString(dict, "createaccount", IDS_SYNC_CREATE_ACCOUNT); | 91 AddString(dict, "createaccount", IDS_SYNC_CREATE_ACCOUNT); |
| 92 AddString(dict, "cancel", IDS_CANCEL); | 92 AddString(dict, "cancel", IDS_CANCEL); |
| 93 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP); | 93 AddString(dict, "settingup", IDS_SYNC_LOGIN_SETTING_UP); |
| 94 AddString(dict, "success", IDS_SYNC_SUCCESS); | 94 AddString(dict, "success", IDS_SYNC_SUCCESS); |
| 95 AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN); | 95 AddString(dict, "errorsigningin", IDS_SYNC_ERROR_SIGNING_IN); |
| 96 AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS); | 96 AddString(dict, "captchainstructions", IDS_SYNC_GAIA_CAPTCHA_INSTRUCTIONS); |
| (...skipping 28 matching lines...) Expand all Loading... |
| 125 return "text/html"; | 125 return "text/html"; |
| 126 } | 126 } |
| 127 | 127 |
| 128 std::string CloudPrintSetupSource::GetLocalizedUrl( | 128 std::string CloudPrintSetupSource::GetLocalizedUrl( |
| 129 const std::string& url) const { | 129 const std::string& url) const { |
| 130 GURL original_url(url); | 130 GURL original_url(url); |
| 131 DCHECK(original_url.is_valid()); | 131 DCHECK(original_url.is_valid()); |
| 132 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url); | 132 GURL localized_url = google_util::AppendGoogleLocaleParam(original_url); |
| 133 return localized_url.spec(); | 133 return localized_url.spec(); |
| 134 } | 134 } |
| OLD | NEW |