Distinguish between keystroke and character events.

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 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 "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 33 matching lines @@
   virtual bool UseNewStyleForThisDialog() const OVERRIDE { return true; }
 
   // ButtonListener override:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE {
     last_pressed_button_ = sender;
   }
 
   Button* last_pressed_button() const { return last_pressed_button_; }
 
   void PressEnterAndCheckStates(Button* button) {
-    ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
+    ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
     GetFocusManager()->OnKeyEvent(key_event);
     const DialogClientView* client_view = GetDialogClientView();
     EXPECT_EQ(canceled_, client_view->cancel_button()->is_default());
     EXPECT_EQ(accepted_, client_view->ok_button()->is_default());
     // This view does not listen for ok or cancel clicks, DialogClientView does.
     CheckAndResetStates(button == client_view->cancel_button(),
                         button == client_view->ok_button(),
                         (canceled_ || accepted_ ) ? NULL : button);
   }
 
@@ skipping 86 matching lines @@
   EXPECT_FALSE(button_2->is_default());
   dialog()->PressEnterAndCheckStates(ok_button);
 }
 
 TEST_F(DialogTest, AcceptAndCancel) {
   DialogClientView* client_view = dialog()->GetDialogClientView();
   LabelButton* ok_button = client_view->ok_button();
   LabelButton* cancel_button = client_view->cancel_button();
 
   // Check that return/escape accelerators accept/cancel dialogs.
-  const ui::KeyEvent return_key(ui::ET_KEY_PRESSED, ui::VKEY_RETURN, 0, false);
+  const ui::KeyEvent return_key(
+      ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
   dialog()->GetFocusManager()->OnKeyEvent(return_key);
   dialog()->CheckAndResetStates(false, true, NULL);
-  const ui::KeyEvent escape_key(ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, 0, false);
+  const ui::KeyEvent escape_key(
+      ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, ui::EF_NONE);
   dialog()->GetFocusManager()->OnKeyEvent(escape_key);
   dialog()->CheckAndResetStates(true, false, NULL);
 
   // Check ok and cancel button behavior on a directed return key events.
   ok_button->OnKeyPressed(return_key);
   dialog()->CheckAndResetStates(false, true, NULL);
   cancel_button->OnKeyPressed(return_key);
   dialog()->CheckAndResetStates(true, false, NULL);
 
   // Check that return accelerators cancel dialogs if cancel is focused.
@@ skipping 45 matching lines @@
             frame2->GetPreferredSize().height());
 
   // Giving the default test dialog a title will yield the same bounds.
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   EXPECT_EQ(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 }
 
 }  // namespace views