Separate out Touch Selection Orientation enum

ui/touch_selection/touch_handle.cc

 // Copyright 2014 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/touch_selection/touch_handle.h"
 
 #include <cmath>
 
 namespace ui {
 
@@ skipping 32 matching lines @@
 }
 
 }  // namespace
 
 // Responsible for rendering a selection or insertion handle for text editing.
 TouchHandle::TouchHandle(TouchHandleClient* client,
                          TouchHandleOrientation orientation)
     : drawable_(client->CreateDrawable()),
       client_(client),
       orientation_(orientation),
-      deferred_orientation_(TOUCH_HANDLE_ORIENTATION_UNDEFINED),
+      deferred_orientation_(TouchHandleOrientation::UNDEFINED),
       alpha_(0.f),
       animate_deferred_fade_(false),
       enabled_(true),
       is_visible_(false),
       is_dragging_(false),
       is_drag_within_tap_region_(false) {
-  DCHECK_NE(orientation, TOUCH_HANDLE_ORIENTATION_UNDEFINED);
+  DCHECK_NE(static_cast<int>(orientation),
+            static_cast<int>(TouchHandleOrientation::UNDEFINED));
   drawable_->SetEnabled(enabled_);
   drawable_->SetOrientation(orientation_);
   drawable_->SetAlpha(alpha_);
   drawable_->SetFocus(position_);
 }
 
 TouchHandle::~TouchHandle() {
 }
 
 void TouchHandle::SetEnabled(bool enabled) {
@@ skipping 37 matching lines @@
   position_ = position;
   // Suppress repositioning a handle while invisible or fading out to prevent it
   // from "ghosting" outside the visible bounds. The position will be pushed to
   // the drawable when the handle regains visibility (see |SetVisible()|).
   if (is_visible_)
     drawable_->SetFocus(position_);
 }
 
 void TouchHandle::SetOrientation(TouchHandleOrientation orientation) {
   DCHECK(enabled_);
-  DCHECK_NE(orientation, TOUCH_HANDLE_ORIENTATION_UNDEFINED);
+  DCHECK_NE(static_cast<int>(orientation),

[jdduke (slow), 2015/02/25 17:36:48]

Dang, I didn't realize our DCHECK code doesn't play nice with enum classes (yet,
see https://codereview.chromium.org/835783003/... hopefully we'll have a generic
solution soon).

If we only use DCHECK_EQ/NE for that enum in this file, could we define:

std::ostream& operator<<(std::ostream& os, const TouchHandlerOrientation&
orientation) {...}

at the top of this file in the anon namespace. Would that work?

[AviD, 2015/02/26 06:28:08]

If we define this in anonymous namespace, it gives unused error.
Defining it in ui namespace is working fine.

+            static_cast<int>(TouchHandleOrientation::UNDEFINED));
   if (is_dragging_) {
     deferred_orientation_ = orientation;
     return;
   }
-  DCHECK_EQ(deferred_orientation_, TOUCH_HANDLE_ORIENTATION_UNDEFINED);
+  DCHECK_EQ(static_cast<int>(deferred_orientation_),
+            static_cast<int>(TouchHandleOrientation::UNDEFINED));
   if (orientation_ == orientation)
     return;
 
   orientation_ = orientation;
   drawable_->SetOrientation(orientation);
 }
 
 bool TouchHandle::WillHandleTouchEvent(const MotionEvent& event) {
   if (!enabled_)
     return false;
@@ skipping 89 matching lines @@
 
 void TouchHandle::EndDrag() {
   DCHECK(enabled_);
   if (!is_dragging_)
     return;
 
   is_dragging_ = false;
   is_drag_within_tap_region_ = false;
   client_->OnHandleDragEnd(*this);
 
-  if (deferred_orientation_ != TOUCH_HANDLE_ORIENTATION_UNDEFINED) {
+  if (deferred_orientation_ != TouchHandleOrientation::UNDEFINED) {
     TouchHandleOrientation deferred_orientation = deferred_orientation_;
-    deferred_orientation_ = TOUCH_HANDLE_ORIENTATION_UNDEFINED;
+    deferred_orientation_ = TouchHandleOrientation::UNDEFINED;
     SetOrientation(deferred_orientation);
   }
 
   if (animate_deferred_fade_) {
     BeginFade();
   } else {
     // As drawable visibility assignment is deferred while dragging, push the
     // change by forcing fade completion.
     EndFade();
   }
@@ skipping 25 matching lines @@
 
 void TouchHandle::SetAlpha(float alpha) {
   alpha = std::max(0.f, std::min(1.f, alpha));
   if (alpha_ == alpha)
     return;
   alpha_ = alpha;
   drawable_->SetAlpha(alpha);
 }
 
 }  // namespace ui