| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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"languageChewingPage", | 56 localized_strings->SetString(L"languageChewingPage", |
| 57 l10n_util::GetString( | 57 l10n_util::GetString( |
| 58 IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE)); | 58 IDS_OPTIONS_SETTINGS_LANGUAGES_CHEWING_SETTINGS_TITLE)); |
| 59 localized_strings->SetString(L"languageHangulPage", | 59 localized_strings->SetString(L"languageHangulPage", |
| 60 l10n_util::GetString( | 60 l10n_util::GetString( |
| 61 IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE)); | 61 IDS_OPTIONS_SETTINGS_LANGUAGES_HANGUL_SETTINGS_TITLE)); |
| 62 localized_strings->SetString(L"languageMozcPage", |
| 63 l10n_util::GetString( |
| 64 IDS_OPTIONS_SETTINGS_LANGUAGES_MOZC_SETTINGS_TITLE)); |
| 62 localized_strings->SetString(L"languagePinyinPage", | 65 localized_strings->SetString(L"languagePinyinPage", |
| 63 l10n_util::GetString( | 66 l10n_util::GetString( |
| 64 IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE)); | 67 IDS_OPTIONS_SETTINGS_LANGUAGES_PINYIN_SETTINGS_TITLE)); |
| 65 #endif | 68 #endif |
| 66 | 69 |
| 67 localized_strings->SetString(L"ok", | 70 localized_strings->SetString(L"ok", |
| 68 l10n_util::GetString(IDS_OK)); | 71 l10n_util::GetString(IDS_OK)); |
| 69 localized_strings->SetString(L"cancel", | 72 localized_strings->SetString(L"cancel", |
| 70 l10n_util::GetString(IDS_CANCEL)); | 73 l10n_util::GetString(IDS_CANCEL)); |
| 71 localized_strings->SetString(L"delete", | 74 localized_strings->SetString(L"delete", |
| (...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 pref_callback_map_.find(*pref_name); | 278 pref_callback_map_.find(*pref_name); |
| 276 iter != pref_callback_map_.end(); ++iter) { | 279 iter != pref_callback_map_.end(); ++iter) { |
| 277 const std::wstring& callback_function = iter->second; | 280 const std::wstring& callback_function = iter->second; |
| 278 ListValue result_value; | 281 ListValue result_value; |
| 279 result_value.Append(Value::CreateStringValue(pref_name->c_str())); | 282 result_value.Append(Value::CreateStringValue(pref_name->c_str())); |
| 280 result_value.Append(pref->GetValue()->DeepCopy()); | 283 result_value.Append(pref->GetValue()->DeepCopy()); |
| 281 dom_ui_->CallJavascriptFunction(callback_function, result_value); | 284 dom_ui_->CallJavascriptFunction(callback_function, result_value); |
| 282 } | 285 } |
| 283 } | 286 } |
| 284 } | 287 } |
| OLD | NEW |