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

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

Issue 10854071: New OOBE design: minor content update (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/ui/webui/chromeos/login/network_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/stringprintf.h" 9 #include "base/stringprintf.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 105
106 scoped_ptr<Value> enabled_value(Value::CreateBooleanValue(enabled)); 106 scoped_ptr<Value> enabled_value(Value::CreateBooleanValue(enabled));
107 web_ui()->CallJavascriptFunction("cr.ui.Oobe.enableContinueButton", 107 web_ui()->CallJavascriptFunction("cr.ui.Oobe.enableContinueButton",
108 *enabled_value); 108 *enabled_value);
109 } 109 }
110 110
111 // NetworkScreenHandler, BaseScreenHandler implementation: -------------------- 111 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------
112 112
113 void NetworkScreenHandler::GetLocalizedStrings( 113 void NetworkScreenHandler::GetLocalizedStrings(
114 base::DictionaryValue* localized_strings) { 114 base::DictionaryValue* localized_strings) {
115 localized_strings->SetString("networkScreenGreeting",
116 l10n_util::GetStringUTF16(IDS_WELCOME_SCREEN_GREETING));
115 localized_strings->SetString("networkScreenTitle", 117 localized_strings->SetString("networkScreenTitle",
116 l10n_util::GetStringUTF16(IDS_WELCOME_SCREEN_TITLE)); 118 l10n_util::GetStringUTF16(IDS_WELCOME_SCREEN_TITLE));
117 localized_strings->SetString("selectLanguage", 119 localized_strings->SetString("selectLanguage",
118 l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT)); 120 l10n_util::GetStringUTF16(IDS_LANGUAGE_SELECTION_SELECT));
119 localized_strings->SetString("selectKeyboard", 121 localized_strings->SetString("selectKeyboard",
120 l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT)); 122 l10n_util::GetStringUTF16(IDS_KEYBOARD_SELECTION_SELECT));
121 localized_strings->SetString("selectNetwork", 123 localized_strings->SetString("selectNetwork",
122 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT)); 124 l10n_util::GetStringUTF16(IDS_NETWORK_SELECTION_SELECT));
123 localized_strings->SetString("proxySettings", 125 localized_strings->SetString("proxySettings",
124 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON)); 126 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 "title", 234 "title",
233 util->GetInputMethodLongName(input_methods->at(i))); 235 util->GetInputMethodLongName(input_methods->at(i)));
234 input_method->SetBoolean("selected", 236 input_method->SetBoolean("selected",
235 ime_id == current_input_method_id); 237 ime_id == current_input_method_id);
236 input_methods_list->Append(input_method); 238 input_methods_list->Append(input_method);
237 } 239 }
238 return input_methods_list; 240 return input_methods_list;
239 } 241 }
240 242
241 } // namespace chromeos 243 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698