| Index: ui/base/ui_base_switches_util.cc
|
| diff --git a/ui/base/ui_base_switches_util.cc b/ui/base/ui_base_switches_util.cc
|
| index 5fe380a21deff0d85060d6bd2586c947df0ec238..6dcb9ef3b329794be58b6b11746623d9e0fc8f52 100644
|
| --- a/ui/base/ui_base_switches_util.cc
|
| +++ b/ui/base/ui_base_switches_util.cc
|
| @@ -13,8 +13,8 @@ bool IsLinkDisambiguationPopupEnabled() {
|
| #if defined(OS_ANDROID)
|
| return true;
|
| #else
|
| - if (CommandLine::ForCurrentProcess()->HasSwitch(
|
| - switches::kEnableLinkDisambiguationPopup)) {
|
| + if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kEnableLinkDisambiguationPopup)) {
|
| return true;
|
| }
|
| return false;
|
| @@ -22,33 +22,34 @@ bool IsLinkDisambiguationPopupEnabled() {
|
| }
|
|
|
| bool IsTextInputFocusManagerEnabled() {
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableTextInputFocusManager);
|
| }
|
|
|
| bool IsTouchDragDropEnabled() {
|
| #if defined(OS_CHROMEOS)
|
| - return !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableTouchDragDrop);
|
| #else
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableTouchDragDrop);
|
| #endif
|
| }
|
|
|
| bool IsTouchEditingEnabled() {
|
| #if defined(USE_AURA)
|
| - return !CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableTouchEditing);
|
| #else
|
| - return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + return base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableTouchEditing);
|
| #endif
|
| }
|
|
|
| bool IsTouchFeedbackEnabled() {
|
| - static bool touch_feedback_enabled = !CommandLine::ForCurrentProcess()->
|
| - HasSwitch(switches::kDisableTouchFeedback);
|
| + static bool touch_feedback_enabled =
|
| + !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| + switches::kDisableTouchFeedback);
|
| return touch_feedback_enabled;
|
| }
|
|
|
|
|