MacViews: Select word under cursor on right click.

ui/views/selection_controller.cc

 // Copyright 2016 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/selection_controller.h"
 
 #include <algorithm>
 
 #include "ui/events/event.h"
 #include "ui/gfx/render_text.h"
@@ skipping 38 matching lines @@
           delegate_->SetTextBeingDragged(true);
         } else {
           delegate_->OnBeforePointerAction();
           const bool selection_changed =
               render_text->MoveCursorTo(event.location(), event.IsShiftDown());
           delegate_->OnAfterPointerAction(false, selection_changed);
         }
         break;
       case 1:
         // Select the word at the click location on a double click.
-        delegate_->OnBeforePointerAction();
-        render_text->MoveCursorTo(event.location(), false);
-        render_text->SelectWord();
-        delegate_->OnAfterPointerAction(false, true);
+        SelectWord(event.location());
         double_click_word_ = render_text->selection();
         break;
       case 2:
         // Select all the text on a triple click.
         delegate_->OnBeforePointerAction();
         render_text->SelectAll(false);
         delegate_->OnAfterPointerAction(false, true);
         break;
       default:
         NOTREACHED();
     }
   }
 
+  // TODO(crbug.com/676296): Right clicking an unfocused text view should select
+  // all its text on Mac.
+  const bool select_word_on_right_click =
+      event.IsOnlyRightMouseButton() &&
+      PlatformStyle::kSelectWordOnRightClick &&
+      !render_text->IsPointInSelection(event.location());
+  if (select_word_on_right_click)
+    SelectWord(event.location());
+
   if (handles_selection_clipboard_ && event.IsOnlyMiddleMouseButton()) {
     if (render_text->IsPointInSelection(event.location())) {
       delegate_->OnBeforePointerAction();
       render_text->ClearSelection();
       delegate_->UpdateSelectionClipboard();
       delegate_->OnAfterPointerAction(false, true);
     } else if (!delegate_->IsReadOnly()) {
       delegate_->OnBeforePointerAction();
       const bool selection_changed =
           render_text->MoveCursorTo(event.location(), false);
       const bool text_changed = delegate_->PasteSelectionClipboard();
       delegate_->OnAfterPointerAction(text_changed,
                                       selection_changed | text_changed);
     }
   }
 
   return true;
 }
 
+void SelectionController::SelectWord(const gfx::Point& point) {

[tapted, 2016/12/22 05:34:46]

nit: reorder to match header (between TrackMouseClicks/GetRenderText)

[karandeepb, 2016/12/22 08:51:25]

Done.

+  gfx::RenderText* render_text = GetRenderText();
+  DCHECK(render_text);
+  delegate_->OnBeforePointerAction();
+  render_text->MoveCursorTo(point, false);
+  render_text->SelectWord();
+  delegate_->OnAfterPointerAction(false, true);
+}
+
 bool SelectionController::OnMouseDragged(const ui::MouseEvent& event) {
   DCHECK(GetRenderText());
   // If |drag_selection_timer_| is running, |last_drag_location_| will be used
   // to update the selection.
   last_drag_location_ = event.location();
 
   // Don't adjust the cursor on a potential drag and drop.
   if (delegate_->HasTextBeingDragged() || !event.IsOnlyLeftMouseButton())
     return true;
 
@@ skipping 99 matching lines @@
         std::max(selection.GetMax(), double_click_word_.GetMax());
     const bool reversed = selection.is_reversed();
     selection.set_start(reversed ? max : min);
     selection.set_end(reversed ? min : max);
     render_text->SelectRange(selection);
   }
   delegate_->OnAfterPointerAction(false, true);
 }
 
 }  // namespace views