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/system_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/system_options_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 26 matching lines...) Expand all Loading... | |
37 #include "ui/base/l10n/l10n_util.h" | 37 #include "ui/base/l10n/l10n_util.h" |
38 #include "ui/base/resource/resource_bundle.h" | 38 #include "ui/base/resource/resource_bundle.h" |
39 | 39 |
40 using content::BrowserThread; | 40 using content::BrowserThread; |
41 | 41 |
42 namespace { | 42 namespace { |
43 | 43 |
44 void TouchpadExistsFileThread(bool* exists) { | 44 void TouchpadExistsFileThread(bool* exists) { |
45 *exists = chromeos::system::touchpad_settings::TouchpadExists(); | 45 *exists = chromeos::system::touchpad_settings::TouchpadExists(); |
46 } | 46 } |
47 | |
James Hawkins
2011/12/15 02:31:30
Add this blank line back (consistency).
achuithb
2011/12/15 02:40:10
Done.
| |
48 } | 47 } |
49 | 48 |
50 SystemOptionsHandler::SystemOptionsHandler() { | 49 SystemOptionsHandler::SystemOptionsHandler() { |
51 } | 50 } |
52 | 51 |
53 SystemOptionsHandler::~SystemOptionsHandler() { | 52 SystemOptionsHandler::~SystemOptionsHandler() { |
54 } | 53 } |
55 | 54 |
56 void SystemOptionsHandler::GetLocalizedValues( | 55 void SystemOptionsHandler::GetLocalizedValues( |
57 DictionaryValue* localized_strings) { | 56 DictionaryValue* localized_strings) { |
(...skipping 10 matching lines...) Expand all Loading... | |
68 | 67 |
69 localized_strings->SetString("screen", | 68 localized_strings->SetString("screen", |
70 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_SCREEN)); | 69 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_SCREEN)); |
71 localized_strings->SetString("brightness", | 70 localized_strings->SetString("brightness", |
72 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_DESCRIPTION)); | 71 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_DESCRIPTION)); |
73 localized_strings->SetString("brightnessDecrease", | 72 localized_strings->SetString("brightnessDecrease", |
74 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_DECREASE)); | 73 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_DECREASE)); |
75 localized_strings->SetString("brightnessIncrease", | 74 localized_strings->SetString("brightnessIncrease", |
76 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_INCREASE)); | 75 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BRIGHTNESS_INCREASE)); |
77 | 76 |
77 localized_strings->SetString("pointer", | |
78 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_POINTER)); | |
78 localized_strings->SetString("touchpad", | 79 localized_strings->SetString("touchpad", |
79 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_TOUCHPAD)); | 80 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_TOUCHPAD)); |
81 localized_strings->SetString("mouse", | |
82 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_MOUSE)); | |
80 localized_strings->SetString("enableTapToClick", | 83 localized_strings->SetString("enableTapToClick", |
81 l10n_util::GetStringUTF16( | 84 l10n_util::GetStringUTF16( |
82 IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION)); | 85 IDS_OPTIONS_SETTINGS_TAP_TO_CLICK_ENABLED_DESCRIPTION)); |
83 localized_strings->SetString("sensitivity", | 86 localized_strings->SetString("sensitivity", |
84 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION)); | 87 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SENSITIVITY_DESCRIPTION)); |
85 localized_strings->SetString("sensitivityLess", | 88 localized_strings->SetString("sensitivityLess", |
86 l10n_util::GetStringUTF16( | 89 l10n_util::GetStringUTF16( |
87 IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION)); | 90 IDS_OPTIONS_SETTINGS_SENSITIVITY_LESS_DESCRIPTION)); |
88 localized_strings->SetString("sensitivityMore", | 91 localized_strings->SetString("sensitivityMore", |
89 l10n_util::GetStringUTF16( | 92 l10n_util::GetStringUTF16( |
90 IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION)); | 93 IDS_OPTIONS_SETTINGS_SENSITIVITY_MORE_DESCRIPTION)); |
94 localized_strings->SetString("primaryMouseRight", | |
95 l10n_util::GetStringUTF16( | |
96 IDS_OPTIONS_SETTINGS_PRIMARY_MOUSE_RIGHT_DESCRIPTION)); | |
91 | 97 |
92 localized_strings->SetString("language", | 98 localized_strings->SetString("language", |
93 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE)); | 99 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE)); |
94 localized_strings->SetString("languageCustomize", | 100 localized_strings->SetString("languageCustomize", |
95 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE)); | 101 l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE)); |
96 localized_strings->SetString("modifierKeysCustomize", | 102 localized_strings->SetString("modifierKeysCustomize", |
97 l10n_util::GetStringUTF16( | 103 l10n_util::GetStringUTF16( |
98 IDS_OPTIONS_SETTINGS_LANGUAGES_MODIFIER_KEYS_CUSTOMIZE)); | 104 IDS_OPTIONS_SETTINGS_LANGUAGES_MODIFIER_KEYS_CUSTOMIZE)); |
99 | 105 |
100 localized_strings->SetString("accessibilityTitle", | 106 localized_strings->SetString("accessibilityTitle", |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 // can make it very difficult to see the increase brightness button. | 167 // can make it very difficult to see the increase brightness button. |
162 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 168 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
163 DecreaseScreenBrightness(false); | 169 DecreaseScreenBrightness(false); |
164 } | 170 } |
165 | 171 |
166 void SystemOptionsHandler::IncreaseScreenBrightnessCallback( | 172 void SystemOptionsHandler::IncreaseScreenBrightnessCallback( |
167 const ListValue* args) { | 173 const ListValue* args) { |
168 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> | 174 chromeos::DBusThreadManager::Get()->GetPowerManagerClient()-> |
169 IncreaseScreenBrightness(); | 175 IncreaseScreenBrightness(); |
170 } | 176 } |
OLD | NEW |