1 files changed, 11 insertions, 0 deletions
diff --git a/chromium/ui/views/controls/textfield/textfield.cc b/chromium/ui/views/controls/textfield/textfield.cc
index 73cccd53cae..d0410cb0536 100644
--- a/chromium/ui/views/controls/textfield/textfield.cc
+++ b/chromium/ui/views/controls/textfield/textfield.cc
@@ -288,6 +288,13 @@ Textfield::Textfield()
     password_reveal_duration_ = ViewsDelegate::views_delegate->
         GetDefaultTextfieldObscuredRevealDuration();
   }
+
+  // These allow BrowserView to pass edit commands from the Chrome menu to us
+  // when we're focused by simply asking the FocusManager to
+  // ProcessAccelerator() with the relevant accelerators.
+  AddAccelerator(ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN));
+  AddAccelerator(ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN));
+  AddAccelerator(ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN));
 }
 
 Textfield::~Textfield() {}
@@ -817,6 +824,10 @@ bool Textfield::AcceleratorPressed(const ui::Accelerator& accelerator) {
   return true;
 }
 
+bool Textfield::CanHandleAccelerators() const {
+  return GetRenderText()->focused() && View::CanHandleAccelerators();
+}
+
 void Textfield::AboutToRequestFocusFromTabTraversal(bool reverse) {
   SelectAll(false);
 }