chrome/browser/chromeos/dom_ui/system_options_handler.cc - Issue 3132023: Add language_prefs namespace to language_preferences.h.

Side by Side Diff: chrome/browser/chromeos/dom_ui/system_options_handler.cc

Issue 3132023: Add language_prefs namespace to language_preferences.h. (Closed)

Patch Set: address comments Created 10 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:

« no previous file with comments | « chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.cc ('k') | chrome/browser/chromeos/input_method/input_method_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/chromeos/dom_ui/system_options_handler.h"	5 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h"

6	6

7 #include <string>	7 #include <string>

8	8

9 #include "app/l10n_util.h"	9 #include "app/l10n_util.h"

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66 localized_strings->SetString("repeat_delay",	66 localized_strings->SetString("repeat_delay",

67 l10n_util::GetStringUTF16(	67 l10n_util::GetStringUTF16(

68 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY));	68 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY));

69 localized_strings->SetString("repeat_delay_short",	69 localized_strings->SetString("repeat_delay_short",

70 l10n_util::GetStringUTF16(	70 l10n_util::GetStringUTF16(

71 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_SHORT));	71 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_SHORT));

72 localized_strings->SetString("repeat_delay_long",	72 localized_strings->SetString("repeat_delay_long",

73 l10n_util::GetStringUTF16(	73 l10n_util::GetStringUTF16(

74 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_LONG));	74 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_DELAY_LONG));

75 localized_strings->SetString("repeat_delay_min",	75 localized_strings->SetString("repeat_delay_min",

76 base::IntToString(chromeos::kXkbAutoRepeatDelayPref.min_pref_value));	76 base::IntToString(

	77 chromeos::language_prefs::kXkbAutoRepeatDelayPref.min_pref_value));

77 localized_strings->SetString("repeat_delay_max",	78 localized_strings->SetString("repeat_delay_max",

78 base::IntToString(chromeos::kXkbAutoRepeatDelayPref.max_pref_value));	79 base::IntToString(

	80 chromeos::language_prefs::kXkbAutoRepeatDelayPref.max_pref_value));

79 localized_strings->SetString("repeat_speed",	81 localized_strings->SetString("repeat_speed",

80 l10n_util::GetStringUTF16(	82 l10n_util::GetStringUTF16(

81 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED));	83 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED));

82 localized_strings->SetString("repeat_speed_fast",	84 localized_strings->SetString("repeat_speed_fast",

83 l10n_util::GetStringUTF16(	85 l10n_util::GetStringUTF16(

84 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_FAST));	86 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_FAST));

85 localized_strings->SetString("repeat_speed_slow",	87 localized_strings->SetString("repeat_speed_slow",

86 l10n_util::GetStringUTF16(	88 l10n_util::GetStringUTF16(

87 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_SLOW));	89 IDS_OPTIONS_SETTINGS_LANGUAGES_XKB_KEY_REPEAT_SPEED_SLOW));

88 localized_strings->SetString("repeat_speed_min",	90 localized_strings->SetString("repeat_speed_min",

89 base::IntToString(chromeos::kXkbAutoRepeatIntervalPref.min_pref_value));	91 base::IntToString(

	92 chromeos::language_prefs::kXkbAutoRepeatIntervalPref.min_pref_value));

90 localized_strings->SetString("repeat_speed_max",	93 localized_strings->SetString("repeat_speed_max",

91 base::IntToString(chromeos::kXkbAutoRepeatIntervalPref.max_pref_value));	94 base::IntToString(

	95 chromeos::language_prefs::kXkbAutoRepeatIntervalPref.max_pref_value));

92	96

93 localized_strings->SetString("accessibility_title",	97 localized_strings->SetString("accessibility_title",

94 l10n_util::GetStringUTF16(	98 l10n_util::GetStringUTF16(

95 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY));	99 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY));

96 localized_strings->SetString("accessibility",	100 localized_strings->SetString("accessibility",

97 l10n_util::GetStringUTF16(	101 l10n_util::GetStringUTF16(

98 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION));	102 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION));

99	103

100 localized_strings->Set("timezoneList",	104 localized_strings->Set("timezoneList",

101 reinterpret_cast<chromeos::SystemSettingsProvider*>(	105 reinterpret_cast<chromeos::SystemSettingsProvider*>(

102 settings_provider_.get())->GetTimezoneList());	106 settings_provider_.get())->GetTimezoneList());

103 }	107 }

104

OLD	NEW