summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 19:51:24 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-01 19:51:24 +0000
commitf311449d333a2034332ebc6aa0370f6a325e267a (patch)
treebb5c9eaf1771d6073b0396ac791d008c74e0cd74 /chrome
parent314eded5c0cada5ceb9333b71d29cbb75e953751 (diff)
downloadchromium_src-f311449d333a2034332ebc6aa0370f6a325e267a.zip
chromium_src-f311449d333a2034332ebc6aa0370f6a325e267a.tar.gz
chromium_src-f311449d333a2034332ebc6aa0370f6a325e267a.tar.bz2
Making sticky keys as default.
Temporary enables for trusted testers for M30. The default value should be flipped to false before M30. BUG=None TEST=None Review URL: https://chromiumcodereview.appspot.com/20788003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215089 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/about_flags.cc3
-rw-r--r--chrome/browser/ui/webui/options/browser_options_handler.cc2
-rw-r--r--chrome/common/chrome_switches.cc3
-rw-r--r--chrome/common/chrome_switches.h2
4 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index dff32ea..2f997ba 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1595,7 +1595,8 @@ const Experiment kExperiments[] = {
IDS_FLAGS_ENABLE_STICKY_KEYS_NAME,
IDS_FLAGS_ENABLE_STICKY_KEYS_DESCRIPTION,
kOsCrOS,
- SINGLE_VALUE_TYPE(switches::kEnableStickyKeys),
+ ENABLE_DISABLE_VALUE_TYPE(switches::kEnableStickyKeys,
+ switches::kDisableStickyKeys)
},
#endif
{
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 1465123..8831a38 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -508,7 +508,7 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
const CommandLine& command_line = *CommandLine::ForCurrentProcess();
values->SetBoolean("enableStickyKeys",
- command_line.HasSwitch(switches::kEnableStickyKeys));
+ !command_line.HasSwitch(switches::kDisableStickyKeys));
#endif
#if defined(OS_MACOSX)
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 8f43526..7590ca6 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -686,6 +686,9 @@ const char kEnableSdch[] = "enable-sdch";
// Enables support of sticky keys.
const char kEnableStickyKeys[] = "enable-sticky-keys";
+// Disables support of sticky keys.
+const char kDisableStickyKeys[] = "disable-sticky-keys";
+
// Disable SPDY/3.1. This is a temporary testing flag.
const char kDisableSpdy31[] = "disable-spdy31";
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 42afaef..84ff1fb 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -196,6 +196,8 @@ extern const char kEnableResourceContentSettings[];
extern const char kEnableSavePasswordBubble[];
extern const char kEnableSdch[];
extern const char kEnableStickyKeys[];
+extern const char kDisableStickyKeys[];
+extern const char kDisableSpdy31[];
extern const char kEnableSpdy4a2[];
extern const char kEnableSpdyCredentialFrames[];
extern const char kEnableSpellingAutoCorrect[];