Merge 227483 "Views Textfield/Omnibox: Do not paste on Ctrl+Alt[..."

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 1172 matching lines @@
   if (key_event.type() == ui::ET_KEY_PRESSED) {
     ui::KeyboardCode key_code = key_event.key_code();
     if (key_code == ui::VKEY_TAB || key_event.IsUnicodeKeyCode())
       return false;
 
     OnBeforeUserAction();
     const bool editable = !textfield_->read_only();
     const bool readable = !textfield_->IsObscured();
     const bool shift = key_event.IsShiftDown();
     const bool control = key_event.IsControlDown();
-    const bool alt = key_event.IsAltDown();
+    const bool alt = key_event.IsAltDown() || key_event.IsAltGrDown();
     bool text_changed = false;
     bool cursor_changed = false;
     switch (key_code) {
       case ui::VKEY_Z:
         if (control && !shift && !alt && editable)
           cursor_changed = text_changed = model_->Undo();
         else if (control && shift && !alt && editable)
           cursor_changed = text_changed = model_->Redo();
         break;
       case ui::VKEY_Y:
@@ skipping 314 matching lines @@
   if (index != -1) {
     obscured_reveal_timer_.Start(
         FROM_HERE,
         duration,
         base::Bind(&NativeTextfieldViews::RevealObscuredChar,
                    base::Unretained(this), -1, base::TimeDelta()));
   }
 }
 
 }  // namespace views