OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/dom_ui/core_options_handler.h" | 5 #include "chrome/browser/dom_ui/core_options_handler.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 | 46 |
47 localized_strings->SetString(L"browserPage", | 47 localized_strings->SetString(L"browserPage", |
48 l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL)); | 48 l10n_util::GetString(IDS_OPTIONS_GENERAL_TAB_LABEL)); |
49 localized_strings->SetString(L"personalPage", | 49 localized_strings->SetString(L"personalPage", |
50 l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL)); | 50 l10n_util::GetString(IDS_OPTIONS_CONTENT_TAB_LABEL)); |
51 localized_strings->SetString(L"advancedPage", | 51 localized_strings->SetString(L"advancedPage", |
52 l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL)); | 52 l10n_util::GetString(IDS_OPTIONS_ADVANCED_TAB_LABEL)); |
53 #if defined(OS_CHROMEOS) | 53 #if defined(OS_CHROMEOS) |
54 localized_strings->SetString(L"internetPage", | 54 localized_strings->SetString(L"internetPage", |
55 l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL)); | 55 l10n_util::GetString(IDS_OPTIONS_INTERNET_TAB_LABEL)); |
| 56 localized_strings->SetString(L"languageHangulPage", |
| 57 l10n_util::GetString( |
| 58 IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE)); |
56 #endif | 59 #endif |
57 } | 60 } |
58 | 61 |
59 void CoreOptionsHandler::Observe(NotificationType type, | 62 void CoreOptionsHandler::Observe(NotificationType type, |
60 const NotificationSource& source, | 63 const NotificationSource& source, |
61 const NotificationDetails& details) { | 64 const NotificationDetails& details) { |
62 if (type == NotificationType::PREF_CHANGED) | 65 if (type == NotificationType::PREF_CHANGED) |
63 NotifyPrefChanged(Details<std::wstring>(details).ptr()); | 66 NotifyPrefChanged(Details<std::wstring>(details).ptr()); |
64 } | 67 } |
65 | 68 |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
234 pref_callback_map_.find(*pref_name); | 237 pref_callback_map_.find(*pref_name); |
235 iter != pref_callback_map_.end(); ++iter) { | 238 iter != pref_callback_map_.end(); ++iter) { |
236 const std::wstring& callback_function = iter->second; | 239 const std::wstring& callback_function = iter->second; |
237 ListValue result_value; | 240 ListValue result_value; |
238 result_value.Append(Value::CreateStringValue(pref_name->c_str())); | 241 result_value.Append(Value::CreateStringValue(pref_name->c_str())); |
239 result_value.Append(pref->GetValue()->DeepCopy()); | 242 result_value.Append(pref->GetValue()->DeepCopy()); |
240 dom_ui_->CallJavascriptFunction(callback_function, result_value); | 243 dom_ui_->CallJavascriptFunction(callback_function, result_value); |
241 } | 244 } |
242 } | 245 } |
243 } | 246 } |
OLD | NEW |