No touch handles when Views textfield cannot get focused

ui/views/controls/textfield/native_textfield_views.cc

 // 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.
 
 #include "ui/views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 188 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));
         OnCaretBoundsChanged();
         SchedulePaint();
         OnAfterUserAction();
-        if (touch_selection_controller_.get())
+        if (!touch_selection_controller_)
+          CreateTouchSelectionControllerAndNotifyIt();
+        if (touch_selection_controller_)
           event->SetHandled();
       } else if (switches::IsTouchDragDropEnabled()) {
         initiating_drag_ = true;
         touch_selection_controller_.reset();
       } else {
-        if (!touch_selection_controller_.get())
+        if (!touch_selection_controller_)
           CreateTouchSelectionControllerAndNotifyIt();
-        if (touch_selection_controller_.get())
+        if (touch_selection_controller_)
           event->SetHandled();
       }
       return;
     case ui::ET_GESTURE_LONG_TAP:
-      if (!touch_selection_controller_.get())
+      if (!touch_selection_controller_)
         CreateTouchSelectionControllerAndNotifyIt();
 
       // If touch selection is enabled, the context menu on long tap will be
       // shown by the |touch_selection_controller_|, hence we mark the event
       // handled so views does not try to show context menu on it.
-      if (touch_selection_controller_.get())
+      if (touch_selection_controller_)
         event->SetHandled();
       break;
     default:
       View::OnGestureEvent(event);
       return;
   }
   PlatformGestureEventHandling(event);
 }
 
 bool NativeTextfieldViews::OnKeyPressed(const ui::KeyEvent& event) {
@@ skipping 1142 matching lines @@
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnTextInputTypeChanged(textfield_);
 }
 
 void NativeTextfieldViews::OnCaretBoundsChanged() {
   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnCaretBoundsChanged(textfield_);
 
   // Notify selection controller
-  if (touch_selection_controller_.get())
+  if (touch_selection_controller_)
     touch_selection_controller_->SelectionChanged();
 }
 
 void NativeTextfieldViews::OnBeforeUserAction() {
   TextfieldController* controller = textfield_->GetController();
   if (controller)
     controller->OnBeforeUserAction(textfield_);
 }
 
 void NativeTextfieldViews::OnAfterUserAction() {
@@ skipping 105 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 void NativeTextfieldViews::CreateTouchSelectionControllerAndNotifyIt() {
+  if (!textfield_->IsFocusable() || !textfield_->HasFocus())

[sky, 2013/12/04 03:56:06]

Why do you need to check IsFocusable? Don't you only care about HasFocus()?

[mohsen, 2013/12/04 05:22:22]

The textfield might have focus before getting disabled/non-focusable. In that
case HasFocus() will be true and if we don't check IsFocusable (which is
`focusable_ && enabled_ && IsDrawn()') handles will be shown on tap.

+    return;
+
   if (!touch_selection_controller_) {
     touch_selection_controller_.reset(
         ui::TouchSelectionController::create(this));
   }
   if (touch_selection_controller_)
     touch_selection_controller_->SelectionChanged();
 }
 
 void NativeTextfieldViews::PlatformGestureEventHandling(
     const ui::GestureEvent* event) {
@@ skipping 11 matching lines @@
   if (index != -1) {
     obscured_reveal_timer_.Start(
         FROM_HERE,
         duration,
         base::Bind(&NativeTextfieldViews::RevealObscuredChar,
                    base::Unretained(this), -1, base::TimeDelta()));
   }
 }
 
 }  // namespace views