[MacViews] Implemented text context menu

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 <utility>
 
 #include "base/strings/utf_string_conversions.h"
@@ skipping 1064 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, WordLookupClient overrides:
 
 bool Textfield::GetDecoratedWordAtPoint(const gfx::Point& point,
                                         gfx::DecoratedText* decorated_word,
                                         gfx::Point* baseline_point) {
   return GetRenderText()->GetDecoratedWordAtPoint(point, decorated_word,
                                                   baseline_point);
 }
 
+bool Textfield::GetDecoratedTextFromSelection(
+    gfx::DecoratedText* decorated_text,
+    gfx::Point* baseline_point) {
+  return GetRenderText()->GetDecoratedTextForRange(
+      GetRenderText()->selection(), decorated_text, baseline_point);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, SelectionControllerDelegate overrides:
 
 bool Textfield::HasTextBeingDragged() const {
   return initiating_drag_;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::TouchEditable overrides:
 
@@ skipping 74 matching lines @@
 }
 
 void Textfield::DestroyTouchSelection() {
   touch_selection_controller_.reset();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::SimpleMenuModel::Delegate overrides:
 
 bool Textfield::IsCommandIdChecked(int command_id) const {
+  if (text_services_context_menu_->IsTextServicesCommandId(command_id))

[tapted, 2016/12/13 05:11:24]

same here - I think only LOOK_UP should get here.

[spqchan, 2016/12/15 23:29:01]

Acknowledged.

+    return text_services_context_menu_->IsCommandIdChecked(command_id);
+
   return true;
 }
 
 bool Textfield::IsCommandIdEnabled(int command_id) const {
+  if (text_services_context_menu_->IsTextServicesCommandId(command_id))

[tapted, 2016/12/13 05:11:24]

text_services_context_menu_ can be null currently, so that needs to be checked
here and in IsCommandIdChecked

Another option could be to return a "dummy" implementation with stub methods, so
that this call works.

[spqchan, 2016/12/15 23:29:01]

Done.

+    return text_services_context_menu_->IsCommandIdEnabled(command_id);
+
   return Textfield::IsTextEditCommandEnabled(
       GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
 }
 
 bool Textfield::GetAcceleratorForCommandId(int command_id,
                                            ui::Accelerator* accelerator) const {
   switch (command_id) {
     case IDS_APP_UNDO:
       *accelerator = ui::Accelerator(ui::VKEY_Z, kPlatformModifier);
       return true;
@@ skipping 13 matching lines @@
     case IDS_APP_SELECT_ALL:
       *accelerator = ui::Accelerator(ui::VKEY_A, kPlatformModifier);
       return true;
 
     default:
       return false;
   }
 }
 
 void Textfield::ExecuteCommand(int command_id, int event_flags) {
+  if (text_services_context_menu_->IsTextServicesCommandId(command_id)) {
+    text_services_context_menu_->ExecuteCommand(command_id, event_flags);
+    return;
+  }
+
   Textfield::ExecuteTextEditCommand(
       GetTextEditCommandFromMenuCommand(command_id, HasSelection()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Textfield, ui::TextInputClient overrides:
 
 void Textfield::SetCompositionText(const ui::CompositionText& composition) {
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return;
@@ skipping 743 matching lines @@
 bool Textfield::Paste() {
   if (!read_only() && model_->Paste()) {
     if (controller_)
       controller_->OnAfterPaste();
     return true;
   }
   return false;
 }
 
 void Textfield::UpdateContextMenu() {
-  if (!context_menu_contents_.get()) {
+  if (!context_menu_contents_.get() ||
+      (text_services_context_menu_ &&
+       text_services_context_menu_->ShouldUpdateMenu())) {
     context_menu_contents_.reset(new ui::SimpleMenuModel(this));
     context_menu_contents_->AddItemWithStringId(IDS_APP_UNDO, IDS_APP_UNDO);
     context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_contents_->AddItemWithStringId(IDS_APP_CUT, IDS_APP_CUT);
     context_menu_contents_->AddItemWithStringId(IDS_APP_COPY, IDS_APP_COPY);
     context_menu_contents_->AddItemWithStringId(IDS_APP_PASTE, IDS_APP_PASTE);
     context_menu_contents_->AddItemWithStringId(IDS_APP_DELETE, IDS_APP_DELETE);
     context_menu_contents_->AddSeparator(ui::NORMAL_SEPARATOR);
     context_menu_contents_->AddItemWithStringId(IDS_APP_SELECT_ALL,
                                                 IDS_APP_SELECT_ALL);
 
     // If the controller adds menu commands, also override ExecuteCommand() and
     // IsCommandIdEnabled() as appropriate, for the commands added.
     if (controller_)
       controller_->UpdateContextMenu(context_menu_contents_.get());
+
+    ViewsTextServicesContextMenu* text_services_menu =
+        ViewsTextServicesContextMenu::Create(
+            this, this, context_menu_contents_.get(), this);
+    if (text_services_menu)
+      text_services_context_menu_.reset(text_services_menu);

[tapted, 2016/12/13 05:11:24]

we should be able to assign directly, so long as `Create` returns a
std:unique_ptr. i.e.

text_services_context_menu_ = ViewsTextServicesContextMenu::Create(..);

[spqchan, 2016/12/15 23:29:01]

Done.

+    else
+      text_services_context_menu_.reset();
+
+    context_menu_runner_.reset(new MenuRunner(context_menu_contents_.get(),

[tapted, 2016/12/13 05:11:24]

this should be outside the `if` I think ? (i.e. below the curly brace on lin
2028)

[spqchan, 2016/12/15 23:29:01]

Done.

+                                              MenuRunner::HAS_MNEMONICS |
+                                                  MenuRunner::CONTEXT_MENU |
+                                                  MenuRunner::ASYNC));
   }
-  context_menu_runner_.reset(new MenuRunner(context_menu_contents_.get(),
-                                            MenuRunner::HAS_MNEMONICS |
-                                                MenuRunner::CONTEXT_MENU |
-                                                MenuRunner::ASYNC));
 }
 
 bool Textfield::ImeEditingAllowed() const {
   // Disallow input method editing of password fields.
   ui::TextInputType t = GetTextInputType();
   return (t != ui::TEXT_INPUT_TYPE_NONE && t != ui::TEXT_INPUT_TYPE_PASSWORD);
 }
 
 void Textfield::RevealPasswordChar(int index) {
   GetRenderText()->SetObscuredRevealIndex(index);
@@ skipping 43 matching lines @@
 }
 
 void Textfield::OnCursorBlinkTimerFired() {
   DCHECK(ShouldBlinkCursor());
   gfx::RenderText* render_text = GetRenderText();
   render_text->set_cursor_visible(!render_text->cursor_visible());
   RepaintCursor();
 }
 
 }  // namespace views