summaryrefslogtreecommitdiffstats
path: root/ui/keyboard
diff options
context:
space:
mode:
authoravi <avi@chromium.org>2014-12-22 21:51:23 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-23 05:52:27 +0000
commit6b10fd03dd0b8ddb91235c49d3f498fb2002c20d (patch)
treed7aab532283c818d2103fc9b5ca8bcf29d50b2c8 /ui/keyboard
parentb126eb8f934f25877b0e6d992902e88eac3fec7f (diff)
downloadchromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.zip
chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.gz
chromium_src-6b10fd03dd0b8ddb91235c49d3f498fb2002c20d.tar.bz2
Make callers of CommandLine use it via the base:: namespace.
Covers testing/, tools/, ui/, and win8/. BUG=422426 TEST=none TBR=ben@chromium.org Review URL: https://codereview.chromium.org/819223002 Cr-Commit-Position: refs/heads/master@{#309538}
Diffstat (limited to 'ui/keyboard')
-rw-r--r--ui/keyboard/keyboard_controller.cc2
-rw-r--r--ui/keyboard/keyboard_util.cc16
2 files changed, 10 insertions, 8 deletions
diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
index 4ee23b1..9065ac6 100644
--- a/ui/keyboard/keyboard_controller.cc
+++ b/ui/keyboard/keyboard_controller.cc
@@ -132,7 +132,7 @@ void ToggleTouchEventLogging(bool enable) {
#if defined(OS_CHROMEOS)
if (!base::SysInfo::IsRunningOnChromeOS())
return;
- CommandLine command(
+ base::CommandLine command(
base::FilePath("/opt/google/touchscreen/toggle_touch_event_logging"));
if (enable)
command.AppendArg("1");
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 1752fd4..8a67e54 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -105,7 +105,7 @@ bool IsKeyboardEnabled() {
if (g_keyboard_show_override == keyboard::KEYBOARD_SHOW_OVERRIDE_DISABLED)
return false;
// Check if any of the flags are enabled.
- return CommandLine::ForCurrentProcess()->HasSwitch(
+ return base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableVirtualKeyboard) ||
g_touch_keyboard_enabled ||
(g_keyboard_show_override == keyboard::KEYBOARD_SHOW_OVERRIDE_ENABLED);
@@ -127,8 +127,8 @@ bool IsKeyboardOverscrollEnabled() {
KEYBOARD_OVERSCROLL_OVERRIDE_ENABLED;
}
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kDisableVirtualKeyboardOverscroll)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableVirtualKeyboardOverscroll)) {
return false;
}
return true;
@@ -143,17 +143,19 @@ void SetKeyboardShowOverride(KeyboardShowOverride override) {
}
bool IsInputViewEnabled() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableInputView))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableInputView))
return true;
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableInputView))
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableInputView))
return false;
// Default value if no command line flags specified.
return true;
}
bool IsExperimentalInputViewEnabled() {
- if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableExperimentalInputViewFeatures)) {
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kEnableExperimentalInputViewFeatures)) {
return true;
}
return false;