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

Unified Diff: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc

Issue 7058048: [cros] Layout for OOBE WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
index aa2f47d84708b53ead7707b0828038da5c305d2f..c6b1eab145191327e91575b9ed9a169a5254ad24 100644
--- a/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/login/oobe_ui.cc
@@ -118,19 +118,28 @@ void CoreOobeHandler::GetLocalizedSettings(DictionaryValue* localized_strings) {
// OOBE title is not actually seen in UI, use title of the welcome screen.
// TODO(altimofeev): move the strings to the corresponding handlers, when
// they will be ready.
+ // OOBE title is not actually seen in UI, use title of the welcome screen.
+ localized_strings->SetString("productName",
+ l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
localized_strings->SetString("title",
- l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
+ l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_TITLE));
localized_strings->SetString("welcomeScreenTitle",
- l10n_util::GetStringFUTF16(IDS_WELCOME_SCREEN_TITLE,
- l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
+ l10n_util::GetStringUTF16(IDS_WELCOME_SCREEN_TITLE));
localized_strings->SetString("languageSelect",
- l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
+ l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
localized_strings->SetString("keyboardSelect",
- l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
+ l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
localized_strings->SetString("networkSelect",
- l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
+ l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
localized_strings->SetString("continue",
l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
+ localized_strings->SetString("updateScreenTitle",
+ l10n_util::GetStringUTF16(IDS_UPDATE_SCREEN_TITLE));
+ localized_strings->SetString("installingUpdate",
+ l10n_util::GetStringFUTF16(IDS_INSTALLING_UPDATE,
+ l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME)));
+ localized_strings->SetString("installingUpdateDesc",
+ l10n_util::GetStringUTF16(IDS_INSTALLING_UPDATE_DESC));
}
void CoreOobeHandler::Initialize() {

Powered by Google App Engine
This is Rietveld 408576698