// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "ui/base/ui_base_switches_util.h"

#include "base/command_line.h"
#include "ui/base/ui_base_switches.h"

namespace switches {

bool IsTouchDragDropEnabled() {
  return CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kEnableTouchDragDrop);
}

bool IsTouchEditingEnabled() {
  return CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kEnableTouchEditing);
}

bool IsNewDialogStyleEnabled() {
  CommandLine* command_line = CommandLine::ForCurrentProcess();
  if (command_line->HasSwitch(switches::kDisableNewDialogStyle))
    return false;
  if (command_line->HasSwitch(switches::kEnableNewDialogStyle))
    return true;
  return true;
}

}  // namespace switches

// Copyright (c) 2013 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "ui/base/ui_base_switches_util.h"

#include "base/command_line.h"
#include "ui/base/ui_base_switches.h"

namespace switches {

bool IsTouchDragDropEnabled() {
#if defined(OS_CHROMEOS)
  return !CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kDisableTouchDragDrop);
#else
  return CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kEnableTouchDragDrop);
#endif
}

bool IsTouchEditingEnabled() {
#if defined(OS_CHROMEOS)
  return !CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kDisableTouchEditing);
#else
  return CommandLine::ForCurrentProcess()->HasSwitch(
      switches::kEnableTouchEditing);
#endif
}

bool IsNewDialogStyleEnabled() {
  CommandLine* command_line = CommandLine::ForCurrentProcess();
  if (command_line->HasSwitch(switches::kDisableNewDialogStyle))
    return false;
  if (command_line->HasSwitch(switches::kEnableNewDialogStyle))
    return true;
  return true;
}

}  // namespace switches

--- 
+++ 
@@ -10,23 +10,13 @@
 namespace switches {
 
 bool IsTouchDragDropEnabled() {
-#if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTouchDragDrop);
-#else
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchDragDrop);
-#endif
 }
 
 bool IsTouchEditingEnabled() {
-#if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kDisableTouchEditing);
-#else
   return CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableTouchEditing);
-#endif
 }
 
 bool IsNewDialogStyleEnabled() {
Revert 205124 "Turn on touch drag and drop and touch editing by ..."

> Turn on touch drag and drop and touch editing by default on chromeos.
> 
> BUG=168162
> 
> Review URL: https://chromiumcodereview.appspot.com/16268020

TBR=varunjain@chromium.org,sky@chromium.org

Review URL: https://codereview.chromium.org/17068008

git-svn-id: de016e52bd170d2d4f2344f9bf92d50478b649e0@207820 0039d316-1c4b-4281-b951-d872f2087c98
