Remove remaining defined(TOUCH_UI) under views/controls

views/controls/textfield/native_textfield_views.cc

 // Copyright (c) 2011 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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 274 matching lines @@
           views::MenuItemView::TOPLEFT, MenuRunner::HAS_MNEMONICS) ==
       MenuRunner::MENU_DELETED)
     return;
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, views::DragController overrides:
 void NativeTextfieldViews::WriteDragDataForView(views::View* sender,
                                                 const gfx::Point& press_pt,
                                                 OSExchangeData* data) {
-#if !defined(TOUCH_UI)
   DCHECK_NE(ui::DragDropTypes::DRAG_NONE,
             GetDragOperationsForView(sender, press_pt));
-#endif
   data->SetString(GetSelectedText());
 }
 
 int NativeTextfieldViews::GetDragOperationsForView(views::View* sender,
                                                    const gfx::Point& p) {
-#if defined(TOUCH_UI)
-  return ui::DragDropTypes::DRAG_NONE;
-#else
   if (!textfield_->IsEnabled() || !GetRenderText()->IsPointInSelection(p))
     return ui::DragDropTypes::DRAG_NONE;
   if (sender == this && !textfield_->read_only())
     return ui::DragDropTypes::DRAG_MOVE | ui::DragDropTypes::DRAG_COPY;
   return ui::DragDropTypes::DRAG_COPY;
-#endif
 }
 
 bool NativeTextfieldViews::CanStartDragForView(View* sender,
                                                const gfx::Point& press_pt,
                                                const gfx::Point& p) {
-#if defined(TOUCH_UI)
-  return false;
-#else
   return GetRenderText()->IsPointInSelection(press_pt);
-#endif
 }
 
 /////////////////////////////////////////////////////////////////
 // NativeTextfieldViews, NativeTextifieldWrapper overrides:
 
 string16 NativeTextfieldViews::GetText() const {
   return model_->GetText();
 }
 
 void NativeTextfieldViews::UpdateText() {
@@ skipping 710 matching lines @@
     last_click_location_ = event.location();
   }
 }
 
 void NativeTextfieldViews::HandleMousePressEvent(const MouseEvent& event) {
   if (event.IsOnlyLeftMouseButton()) {
     textfield_->RequestFocus();
 
     initiating_drag_ = false;
     bool can_drag = true;
-#if defined(TOUCH_UI)
-    // Temporarily disable drag and drop on touch builds; see crbug.com/97845.
-    can_drag = false;
-#endif
+
     switch(aggregated_clicks_) {
       case 0:
         if (can_drag && GetRenderText()->IsPointInSelection(event.location()))
           initiating_drag_ = true;
         else
           MoveCursorTo(event.location(), event.IsShiftDown());
         break;
       case 1:
         model_->SelectWord();
         OnCaretBoundsChanged();
@@ skipping 22 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views