Consistent fading behavior for touch editing handles

ui/views/controls/textfield/textfield.cc

 // Copyright (c) 2012 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/views/controls/textfield/textfield.h"
 
 #include <string>
 
 #include "base/debug/trace_event.h"
 #include "grit/ui_strings.h"
@@ skipping 318 matching lines @@
 void Textfield::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   PaintTextAndCursor(canvas);
   OnPaintBorder(canvas);
   if (NativeViewHost::kRenderNativeControlFocus)
     Painter::PaintFocusPainter(this, canvas, focus_painter_.get());
 }
 
 bool Textfield::OnKeyPressed(const ui::KeyEvent& event) {
   bool handled = controller_ && controller_->HandleKeyEvent(this, event);
-  touch_selection_controller_.reset();
+  SetTouchSelectionController(NULL);
   if (handled)
     return true;
 
   // TODO(oshima): Refactor and consolidate with ExecuteCommand.
   if (event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = event.key_code();
     if (key_code == ui::VKEY_TAB || event.IsUnicodeKeyCode())
       return false;
 
     gfx::RenderText* render_text = GetRenderText();
@@ skipping 141 matching lines @@
           OnCaretBoundsChanged();
           break;
         default:
           NOTREACHED();
       }
     }
     SchedulePaint();
   }
 
   OnAfterUserAction();
-  touch_selection_controller_.reset();
+  SetTouchSelectionController(NULL);
   return true;
 }
 
 bool Textfield::OnMouseDragged(const ui::MouseEvent& event) {
   // Don't adjust the cursor on a potential drag and drop, or if the mouse
   // movement from the last mouse click does not exceed the drag threshold.
   if (initiating_drag_ || !event.IsOnlyLeftMouseButton() ||
       !ExceededDragThreshold(event.location() - last_click_location_)) {
     return true;
   }
@@ skipping 49 matching lines @@
 
 void Textfield::OnBlur() {
   GetRenderText()->set_focused(false);
   GetInputMethod()->OnBlur();
   cursor_repaint_timer_.Stop();
   if (cursor_visible_) {
     cursor_visible_ = false;
     RepaintCursor();
   }
 
-  touch_selection_controller_.reset();
+  SetTouchSelectionController(NULL);
 
   // Border typically draws focus indicator.
   SchedulePaint();
 }
 
 void Textfield::GetAccessibleState(ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_TEXT;
   state->name = accessible_name_;
   if (read_only())
     state->state |= ui::AccessibilityTypes::STATE_READONLY;
@@ skipping 91 matching lines @@
       // If long press happens outside selection, select word and show context
       // menu (If touch selection is enabled, context menu is shown by the
       // |touch_selection_controller_|, hence we mark the event handled.
       // Otherwise, the regular context menu will be shown by views).
       // If long press happens in selected text and touch drag drop is enabled,
       // we will turn off touch selection (if one exists) and let views do drag
       // drop.
       if (!GetRenderText()->IsPointInSelection(event->location())) {
         OnBeforeUserAction();
         model_->SelectWord();
-        touch_selection_controller_.reset(
-            ui::TouchSelectionController::create(this));
+        SetTouchSelectionController(ui::TouchSelectionController::create(this));
         OnCaretBoundsChanged();
         SchedulePaint();
         OnAfterUserAction();
         if (touch_selection_controller_)
           event->SetHandled();
       } else if (switches::IsTouchDragDropEnabled()) {
         initiating_drag_ = true;
-        touch_selection_controller_.reset();
+        SetTouchSelectionController(NULL);
       } else {
         if (!touch_selection_controller_)
           CreateTouchSelectionControllerAndNotifyIt();
         if (touch_selection_controller_)
           event->SetHandled();
       }
       return;
     case ui::ET_GESTURE_LONG_TAP:
       if (!touch_selection_controller_)
         CreateTouchSelectionControllerAndNotifyIt();
@@ skipping 222 matching lines @@
 
 void Textfield::ConvertPointFromScreen(gfx::Point* point) {
   View::ConvertPointFromScreen(this, point);
 }
 
 bool Textfield::DrawsHandles() {
   return false;
 }
 
 void Textfield::OpenContextMenu(const gfx::Point& anchor) {
-  touch_selection_controller_.reset();
+  SetTouchSelectionController(NULL);
   ShowContextMenu(anchor, ui::MENU_SOURCE_TOUCH_EDIT_MENU);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::SimpleMenuModel::Delegate overrides:
 
 bool Textfield::IsCommandIdChecked(int command_id) const {
   return true;
 }
 
@@ skipping 20 matching lines @@
       return false;
   }
 }
 
 bool Textfield::GetAcceleratorForCommandId(int command_id,
                                            ui::Accelerator* accelerator) {
   return false;
 }
 
 void Textfield::ExecuteCommand(int command_id, int event_flags) {
-  touch_selection_controller_.reset();
+  SetTouchSelectionController(NULL);
   if (!IsCommandIdEnabled(command_id))
     return;
 
   bool text_changed = false;
   switch (command_id) {
     case IDS_APP_UNDO:
       OnBeforeUserAction();
       text_changed = model_->Undo();
       UpdateAfterChange(text_changed, text_changed);
       OnAfterUserAction();
@@ skipping 468 matching lines @@
   SchedulePaint();
 
   if (index != -1) {
     password_reveal_timer_.Start(FROM_HERE, password_reveal_duration_,
         base::Bind(&Textfield::RevealPasswordChar,
                    weak_ptr_factory_.GetWeakPtr(), -1));
   }
 }
 
 void Textfield::CreateTouchSelectionControllerAndNotifyIt() {
-  if (!touch_selection_controller_) {
-    touch_selection_controller_.reset(
-        ui::TouchSelectionController::create(this));
-  }
+  if (!touch_selection_controller_)
+    SetTouchSelectionController(ui::TouchSelectionController::create(this));
   if (touch_selection_controller_)
     touch_selection_controller_->SelectionChanged();
 }
 
+void Textfield::SetTouchSelectionController(ui::TouchSelectionController* tsc) {
+  if (touch_selection_controller_)
+    touch_selection_controller_->HideHandles(false);
+  touch_selection_controller_.reset(tsc);

[sky, 2014/01/16 23:15:02]

Can the destructor imply HideHandles(false) so that you don't need 1471/1472?

[mohsen, 2014/01/17 02:09:41]

Yep! Done.
Now, handles fade out in their destructor, unless they are previously hidden.
So, those lines are not needed anymore as well as this helper function.

+}
+
 }  // namespace views