Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1037)

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 10915140: Add the partial screen magnifier to Chrome OS. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 { "themes", IDS_THEMES_GROUP_NAME }, 280 { "themes", IDS_THEMES_GROUP_NAME },
281 { "themesReset", IDS_THEMES_RESET_BUTTON }, 281 { "themesReset", IDS_THEMES_RESET_BUTTON },
282 #endif 282 #endif
283 #if defined(OS_CHROMEOS) 283 #if defined(OS_CHROMEOS)
284 { "accessibilityHighContrast", 284 { "accessibilityHighContrast",
285 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION }, 285 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_HIGH_CONTRAST_DESCRIPTION },
286 { "accessibilityScreenMagnifier", 286 { "accessibilityScreenMagnifier",
287 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION }, 287 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_DESCRIPTION },
288 { "accessibilityTapDragging", 288 { "accessibilityTapDragging",
289 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 289 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
290 { "accessibilityScreenMagnifierOff",
291 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
292 { "accessibilityScreenMagnifierFull",
293 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
294 { "accessibilityScreenMagnifierPartial",
295 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
290 { "accessibilitySpokenFeedback", 296 { "accessibilitySpokenFeedback",
291 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION }, 297 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION },
292 { "accessibilityTitle", 298 { "accessibilityTitle",
293 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 299 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
294 { "accessibilityVirtualKeyboard", 300 { "accessibilityVirtualKeyboard",
295 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 301 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
296 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 302 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
297 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON }, 303 { "factoryResetRestart", IDS_OPTIONS_FACTORY_RESET_BUTTON },
298 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON }, 304 { "factoryResetDataRestart", IDS_RELAUNCH_BUTTON },
299 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE_CAPTION }, 305 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE_CAPTION },
(...skipping 962 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 1268
1263 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) { 1269 void BrowserOptionsHandler::HighContrastChangeCallback(const ListValue* args) {
1264 bool enabled = false; 1270 bool enabled = false;
1265 args->GetBoolean(0, &enabled); 1271 args->GetBoolean(0, &enabled);
1266 1272
1267 chromeos::accessibility::EnableHighContrast(enabled); 1273 chromeos::accessibility::EnableHighContrast(enabled);
1268 } 1274 }
1269 1275
1270 void BrowserOptionsHandler::ScreenMagnifierChangeCallback( 1276 void BrowserOptionsHandler::ScreenMagnifierChangeCallback(
1271 const ListValue* args) { 1277 const ListValue* args) {
1272 bool enabled = false; 1278 std::string type_name;
1273 args->GetBoolean(0, &enabled); 1279 args->GetString(0, &type_name);
1274 1280
1275 chromeos::accessibility::EnableScreenMagnifier(enabled); 1281 chromeos::accessibility::ScreenMagnifierType type =
1282 chromeos::accessibility::ScreenMagnifierTypeFromName(type_name.c_str());
1283
1284 chromeos::accessibility::SetScreenMagnifier(type);
1276 } 1285 }
1277 1286
1278 void BrowserOptionsHandler::VirtualKeyboardChangeCallback( 1287 void BrowserOptionsHandler::VirtualKeyboardChangeCallback(
1279 const ListValue* args) { 1288 const ListValue* args) {
1280 bool enabled = false; 1289 bool enabled = false;
1281 args->GetBoolean(0, &enabled); 1290 args->GetBoolean(0, &enabled);
1282 1291
1283 chromeos::accessibility::EnableVirtualKeyboard(enabled); 1292 chromeos::accessibility::EnableVirtualKeyboard(enabled);
1284 } 1293 }
1285 1294
(...skipping 19 matching lines...) Expand all
1305 base::FundamentalValue spoken_feedback_enabled( 1314 base::FundamentalValue spoken_feedback_enabled(
1306 pref_service->GetBoolean(prefs::kSpokenFeedbackEnabled)); 1315 pref_service->GetBoolean(prefs::kSpokenFeedbackEnabled));
1307 web_ui()->CallJavascriptFunction( 1316 web_ui()->CallJavascriptFunction(
1308 "BrowserOptions.setSpokenFeedbackCheckboxState", 1317 "BrowserOptions.setSpokenFeedbackCheckboxState",
1309 spoken_feedback_enabled); 1318 spoken_feedback_enabled);
1310 base::FundamentalValue high_contrast_enabled( 1319 base::FundamentalValue high_contrast_enabled(
1311 pref_service->GetBoolean(prefs::kHighContrastEnabled)); 1320 pref_service->GetBoolean(prefs::kHighContrastEnabled));
1312 web_ui()->CallJavascriptFunction( 1321 web_ui()->CallJavascriptFunction(
1313 "BrowserOptions.setHighContrastCheckboxState", 1322 "BrowserOptions.setHighContrastCheckboxState",
1314 high_contrast_enabled); 1323 high_contrast_enabled);
1315 base::FundamentalValue screen_magnifier_enabled( 1324
1316 pref_service->GetBoolean(prefs::kScreenMagnifierEnabled)); 1325 base::StringValue magnifier_type(
1326 pref_service->GetString(prefs::kScreenMagnifierType));
1317 web_ui()->CallJavascriptFunction( 1327 web_ui()->CallJavascriptFunction(
1318 "BrowserOptions.setScreenMagnifierCheckboxState", 1328 "BrowserOptions.setScreenMagnifierTypeState",
1319 screen_magnifier_enabled); 1329 magnifier_type);
1330
1320 base::FundamentalValue virtual_keyboard_enabled( 1331 base::FundamentalValue virtual_keyboard_enabled(
1321 pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled)); 1332 pref_service->GetBoolean(prefs::kVirtualKeyboardEnabled));
1322 web_ui()->CallJavascriptFunction( 1333 web_ui()->CallJavascriptFunction(
1323 "BrowserOptions.setVirtualKeyboardCheckboxState", 1334 "BrowserOptions.setVirtualKeyboardCheckboxState",
1324 virtual_keyboard_enabled); 1335 virtual_keyboard_enabled);
1325 } 1336 }
1326 #endif 1337 #endif
1327 1338
1328 void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() { 1339 void BrowserOptionsHandler::SetupMetricsReportingSettingVisibility() {
1329 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS) 1340 #if defined(GOOGLE_CHROME_BUILD) && defined(OS_CHROMEOS)
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1419 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); 1430 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
1420 } 1431 }
1421 StringValue label(label_str); 1432 StringValue label(label_str);
1422 1433
1423 web_ui()->CallJavascriptFunction( 1434 web_ui()->CallJavascriptFunction(
1424 "BrowserOptions.setupProxySettingsSection", disabled, label); 1435 "BrowserOptions.setupProxySettingsSection", disabled, label);
1425 #endif // !defined(OS_CHROMEOS) 1436 #endif // !defined(OS_CHROMEOS)
1426 } 1437 }
1427 1438
1428 } // namespace options 1439 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698