Re-land: NativeTextfieldViews: Show the drop cursor when dragging text

ui/views/controls/textfield/native_textfield_views.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "ui/base/events/event_constants.h"
@@ skipping 51 matching lines @@
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool GetDropFormats(
       int* formats,
       std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
   virtual bool CanDrop(const ui::OSExchangeData& data) OVERRIDE;
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
+  virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragDone() OVERRIDE;
   virtual bool OnKeyReleased(const ui::KeyEvent& event) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
   virtual void OnNativeThemeChanged(const ui::NativeTheme* theme) OVERRIDE;
 
   // ui::TouchEditable overrides:
   virtual void SelectRect(const gfx::Point& start,
@@ skipping 204 matching lines @@
   Textfield* textfield_;
 
   // The text model.
   scoped_ptr<TextfieldViewsModel> model_;
 
   // The reference to the border class. The object is owned by View::border_.
   FocusableBorder* text_border_;
 
   // The textfield's text and drop cursor visibility.
   bool is_cursor_visible_;
+
   // The drop cursor is a visual cue for where dragged text will be dropped.
   bool is_drop_cursor_visible_;
+  // Position of the drop cursor, if it is visible.
+  gfx::SelectionModel drop_cursor_position_;
 
   // True if InputMethod::CancelComposition() should not be called.
   bool skip_input_method_cancel_composition_;
 
   // Is the user potentially dragging and dropping from this view?
   bool initiating_drag_;
 
   // A runnable method factory for callback to update the cursor.
   base::WeakPtrFactory<NativeTextfieldViews> cursor_timer_;
 
   // State variables used to track double and triple clicks.
   size_t aggregated_clicks_;
   base::TimeDelta last_click_time_;
   gfx::Point last_click_location_;
 
   // Context menu and its content list for the textfield.
   scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
   scoped_ptr<views::MenuModelAdapter> context_menu_delegate_;
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   scoped_ptr<ui::TouchSelectionController> touch_selection_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldViews);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_NATIVE_TEXTFIELD_VIEWS_H_