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

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: Addressing a comment Created 7 years, 5 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
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/common/chrome_switches.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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 { "accessibilityTapDragging", 353 { "accessibilityTapDragging",
354 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 354 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
355 { "accessibilityScreenMagnifierOff", 355 { "accessibilityScreenMagnifierOff",
356 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF }, 356 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_OFF },
357 { "accessibilityScreenMagnifierFull", 357 { "accessibilityScreenMagnifierFull",
358 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL }, 358 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL },
359 { "accessibilityScreenMagnifierPartial", 359 { "accessibilityScreenMagnifierPartial",
360 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL }, 360 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL },
361 { "accessibilityLargeCursor", 361 { "accessibilityLargeCursor",
362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION }, 362 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_LARGE_CURSOR_DESCRIPTION },
363 { "accessibilityStickyKeys",
364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
363 { "accessibilitySpokenFeedback", 365 { "accessibilitySpokenFeedback",
364 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION }, 366 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SPOKEN_FEEDBACK_DESCRIPTION },
365 { "accessibilityTitle", 367 { "accessibilityTitle",
366 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY }, 368 IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY },
367 { "accessibilityVirtualKeyboard", 369 { "accessibilityVirtualKeyboard",
368 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
369 { "accessibilityAlwaysShowMenu", 371 { "accessibilityAlwaysShowMenu",
370 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU }, 372 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SHOULD_ALWAYS_SHOW_MENU },
371 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING }, 373 { "factoryResetHeading", IDS_OPTIONS_FACTORY_RESET_HEADING },
372 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET }, 374 { "factoryResetTitle", IDS_OPTIONS_FACTORY_RESET },
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL)); 495 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_FULL));
494 magnifier_list->Append(option_full.release()); 496 magnifier_list->Append(option_full.release());
495 497
496 scoped_ptr<base::ListValue> option_partial(new base::ListValue); 498 scoped_ptr<base::ListValue> option_partial(new base::ListValue);
497 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL); 499 option_partial->AppendInteger(ash::MAGNIFIER_PARTIAL);
498 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16( 500 option_partial->Append(new base::StringValue(l10n_util::GetStringUTF16(
499 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL))); 501 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SCREEN_MAGNIFIER_PARTIAL)));
500 magnifier_list->Append(option_partial.release()); 502 magnifier_list->Append(option_partial.release());
501 503
502 values->Set("magnifierList", magnifier_list.release()); 504 values->Set("magnifierList", magnifier_list.release());
505
506 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
507 values->SetBoolean("enableStickyKeys",
508 command_line.HasSwitch(switches::kEnableStickyKeys));
503 #endif 509 #endif
504 510
505 #if defined(OS_MACOSX) 511 #if defined(OS_MACOSX)
506 values->SetString("macPasswordsWarning", 512 values->SetString("macPasswordsWarning",
507 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING)); 513 l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MAC_WARNING));
508 values->SetBoolean("multiple_profiles", 514 values->SetBoolean("multiple_profiles",
509 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1); 515 g_browser_process->profile_manager()->GetNumberOfProfiles() > 1);
510 #endif 516 #endif
511 517
512 if (ShouldShowMultiProfilesUserList(GetDesktopType())) 518 if (ShouldShowMultiProfilesUserList(GetDesktopType()))
(...skipping 1207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1720 base::FundamentalValue disabled(proxy_config && 1726 base::FundamentalValue disabled(proxy_config &&
1721 !proxy_config->IsUserModifiable()); 1727 !proxy_config->IsUserModifiable());
1722 base::FundamentalValue extension_controlled(is_extension_controlled); 1728 base::FundamentalValue extension_controlled(is_extension_controlled);
1723 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection", 1729 web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
1724 disabled, extension_controlled); 1730 disabled, extension_controlled);
1725 1731
1726 #endif // !defined(OS_CHROMEOS) 1732 #endif // !defined(OS_CHROMEOS)
1727 } 1733 }
1728 1734
1729 } // namespace options 1735 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/browser_options.js ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698