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/ui/webui/options/chromeos/language_hangul_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/language_hangul_handler.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "chrome/browser/chromeos/language_preferences.h" | 9 #include "chrome/browser/chromeos/language_preferences.h" |
10 #include "grit/generated_resources.h" | 10 #include "grit/generated_resources.h" |
(...skipping 17 matching lines...) Expand all Loading... |
28 localized_strings->SetString("hangul_keyboard_layout", | 28 localized_strings->SetString("hangul_keyboard_layout", |
29 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT)); | 29 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_KEYBOARD_LAYOUT_TEXT)); |
30 | 30 |
31 localized_strings->Set("HangulkeyboardLayoutList", GetKeyboardLayoutList()); | 31 localized_strings->Set("HangulkeyboardLayoutList", GetKeyboardLayoutList()); |
32 } | 32 } |
33 | 33 |
34 ListValue* LanguageHangulHandler::GetKeyboardLayoutList() { | 34 ListValue* LanguageHangulHandler::GetKeyboardLayoutList() { |
35 ListValue* keyboard_layout_list = new ListValue(); | 35 ListValue* keyboard_layout_list = new ListValue(); |
36 for (size_t i = 0; i < language_prefs::kNumHangulKeyboardNameIDPairs; ++i) { | 36 for (size_t i = 0; i < language_prefs::kNumHangulKeyboardNameIDPairs; ++i) { |
37 ListValue* option = new ListValue(); | 37 ListValue* option = new ListValue(); |
38 option->Append(Value::CreateStringValue( | 38 option->Append(base::StringValue::New( |
39 language_prefs::kHangulKeyboardNameIDPairs[i].keyboard_id)); | 39 language_prefs::kHangulKeyboardNameIDPairs[i].keyboard_id)); |
40 option->Append(Value::CreateStringValue(l10n_util::GetStringUTF16( | 40 option->Append(base::StringValue::New(l10n_util::GetStringUTF16( |
41 language_prefs::kHangulKeyboardNameIDPairs[i].message_id))); | 41 language_prefs::kHangulKeyboardNameIDPairs[i].message_id))); |
42 keyboard_layout_list->Append(option); | 42 keyboard_layout_list->Append(option); |
43 } | 43 } |
44 return keyboard_layout_list; | 44 return keyboard_layout_list; |
45 } | 45 } |
46 | 46 |
47 } // namespace chromeos | 47 } // namespace chromeos |
OLD | NEW |