Unify TouchAction classes

content/common/input/touch_action.h

Index: content/common/input/touch_action.h
diff --git a/content/common/input/touch_action.h b/content/common/input/touch_action.h
deleted file mode 100644
index 2a00a038c1e577bfd6babc398f4b0f92f1d6afb3..0000000000000000000000000000000000000000
--- a/content/common/input/touch_action.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 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.
-
-#ifndef CONTENT_COMMON_INPUT_TOUCH_ACTION_H_
-#define CONTENT_COMMON_INPUT_TOUCH_ACTION_H_
-
-namespace content {
-
-// The current touch action specifies what accelerated browser operations
-// (panning and zooming) are currently permitted via touch input.
-// See http://www.w3.org/TR/pointerevents/#the-touch-action-css-property.
-enum TouchAction {
-  // No scrolling or zooming allowed.
-  TOUCH_ACTION_NONE = 0,
-
-  TOUCH_ACTION_PAN_LEFT = 1 << 0,
-
-  TOUCH_ACTION_PAN_RIGHT = 1 << 1,
-
-  TOUCH_ACTION_PAN_X = TOUCH_ACTION_PAN_LEFT | TOUCH_ACTION_PAN_RIGHT,
-
-  TOUCH_ACTION_PAN_UP = 1 << 2,
-
-  TOUCH_ACTION_PAN_DOWN = 1 << 3,
-
-  TOUCH_ACTION_PAN_Y = TOUCH_ACTION_PAN_UP | TOUCH_ACTION_PAN_DOWN,
-
-  TOUCH_ACTION_PAN = TOUCH_ACTION_PAN_X | TOUCH_ACTION_PAN_Y,
-
-  TOUCH_ACTION_PINCH_ZOOM = 1 << 4,
-
-  TOUCH_ACTION_MANIPULATION = TOUCH_ACTION_PAN | TOUCH_ACTION_PINCH_ZOOM,
-
-  TOUCH_ACTION_DOUBLE_TAP_ZOOM = 1 << 5,
-
-  // All actions are permitted (the default).
-  TOUCH_ACTION_AUTO = TOUCH_ACTION_MANIPULATION | TOUCH_ACTION_DOUBLE_TAP_ZOOM,
-
-  TOUCH_ACTION_MAX = (1 << 6) - 1
-};
-
-inline TouchAction operator| (TouchAction a, TouchAction b)
-{
-  return static_cast<TouchAction>(int(a) | int(b));
-}
-inline TouchAction& operator|= (TouchAction& a, TouchAction b)
-{
-  return a = a | b;
-}
-inline TouchAction operator& (TouchAction a, TouchAction b)
-{
-  return static_cast<TouchAction>(int(a) & int(b));
-}
-inline TouchAction& operator&= (TouchAction& a, TouchAction b)
-{
-  return a = a & b;
-}
-
-}  // namespace content
-
-#endif  // CONTENT_COMMON_INPUT_TOUCH_ACTION_H_