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

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

Issue 16535004: Introduce StickyKeys settings item with behind flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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:
View unified diff | Download patch | Annotate | Revision Log
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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 { "accessibilityTapDragging", 357 { "accessibilityTapDragging",
358 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 358 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
359 { "accessibilityScreenMagnifierOff", 359 { "accessibilityScreenMagnifierOff",
360 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF }, 360 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
361 { "accessibilityScreenMagnifierFull", 361 { "accessibilityScreenMagnifierFull",
362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL }, 362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
363 { "accessibilityScreenMagnifierPartial", 363 { "accessibilityScreenMagnifierPartial",
364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL }, 364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
365 { "accessibilityLargeCursor", 365 { "accessibilityLargeCursor",
366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION }, 366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION },
367 { "accessibilityStickyKeys",
368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
367 { "accessibilitySpokenFeedback", 369 { "accessibilitySpokenFeedback",
368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION }, 370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
369 { "accessibilityTitle", 371 { "accessibilityTitle",
370 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 372 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
371 { "accessibilityVirtualKeyboard", 373 { "accessibilityVirtualKeyboard",
372 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 374 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
373 { "accessibilityAlwaysShowMenu", 375 { "accessibilityAlwaysShowMenu",
374 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU }, 376 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
375 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING }, 377 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
376 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 378 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)); 499 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
498 magnifier_list->Append(option_full.release()); 500 magnifier_list->Append(option_full.release());
499 501
500 scoped_ptr<base::ListValue> option_partial(new base::ListValue); 502 scoped_ptr<base::ListValue> option_partial(new base::ListValue);
501 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); 503 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
502 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 504 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
503 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 505 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
504 magnifier_list->Append(option_partial.release()); 506 magnifier_list->Append(option_partial.release());
505 507
506 values->Set("magnifierList", magnifier_list.release()); 508 values->Set("magnifierList", magnifier_list.release());
509
510 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
511 values->SetBoolean("enableStickyKeys",
512 command_line.HasSwitch(switches::kEnableStickyKeys));
507 #endif 513 #endif
508 514
509 #if defined(OS_MACOSX) 515 #if defined(OS_MACOSX)
510 values->SetString("macPasswordsWarning", 516 values->SetString("macPasswordsWarning",
511 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 517 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
512 values->SetBoolean("multiple_profiles", 518 values->SetBoolean("multiple_profiles",
513 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1); 519 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
514 #endif 520 #endif
515 521
516 if (ShouldShowMultiProfilesUserList()) 522 if (ShouldShowMultiProfilesUserList())
(...skipping 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1741 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() || 1747 base::FundamentalValue disabled(profile_pref_registrar_.IsManaged() ||
1742 is_extension_controlled); 1748 is_extension_controlled);
1743 base::FundamentalValue extension_controlled(is_extension_controlled); 1749 base::FundamentalValue extension_controlled(is_extension_controlled);
1744 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1750 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1745 disabled, extension_controlled); 1751 disabled, extension_controlled);
1746 1752
1747 #endif // !defined(OS_CHROMEOS) 1753 #endif // !defined(OS_CHROMEOS)
1748 } 1754 }
1749 1755
1750 } // namespace options 1756 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698