wip: Add ui::EventType parameter.

ui/views/window/dialog_client_view.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/window/dialog_client_view.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 113 matching lines @@
     bool is_default_button =
         (dd->GetDefaultDialogButton() & ui::DIALOG_BUTTON_OK) != 0;
     ok_button_ = new DialogButton(this,
                                   GetWidget(),
                                   ui::DIALOG_BUTTON_OK,
                                   label,
                                   is_default_button);
     ok_button_->SetGroup(kButtonGroup);
     if (is_default_button)
       default_button_ = ok_button_;
-    if (!(buttons & ui::DIALOG_BUTTON_CANCEL))
-      ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
+    if (!(buttons & ui::DIALOG_BUTTON_CANCEL)) {
+      ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
+                                                 ui::EF_NONE,
+                                                 ui::ET_KEY_PRESSED));
+    }
     AddChildView(ok_button_);
   }
   if (buttons & ui::DIALOG_BUTTON_CANCEL && !cancel_button_) {
     string16 label =
         dd->GetDialogButtonLabel(ui::DIALOG_BUTTON_CANCEL);
     if (label.empty()) {
       if (buttons & ui::DIALOG_BUTTON_OK) {
         label = l10n_util::GetStringUTF16(IDS_APP_CANCEL);
       } else {
         label = l10n_util::GetStringUTF16(IDS_APP_CLOSE);
       }
     }
     bool is_default_button =
         (dd->GetDefaultDialogButton() & ui::DIALOG_BUTTON_CANCEL)
         != 0;
     cancel_button_ = new DialogButton(this,
                                       GetWidget(),
                                       ui::DIALOG_BUTTON_CANCEL,
                                       label,
                                       is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
     cancel_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
-                                                   ui::EF_NONE));
+                                                   ui::EF_NONE,
+                                                   ui::ET_KEY_PRESSED));
     if (is_default_button)
       default_button_ = ok_button_;
     AddChildView(cancel_button_);
   }
   if (!buttons) {
     // Register the escape key as an accelerator which will close the window
     // if there are no dialog buttons.
-    AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
+    AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
+                                   ui::EF_NONE,
+                                   ui::ET_KEY_PRESSED));
   }
 }
 
 void DialogClientView::SetDefaultButton(NativeTextButton* new_default_button) {
   if (default_button_ && default_button_ != new_default_button) {
     default_button_->SetIsDefault(false);
     default_button_ = NULL;
   }
 
   if (new_default_button) {
@@ skipping 346 matching lines @@
   }
   saved_focus_manager_ = focus_manager;
   // Listen for focus change events so we can update the default button.
   if (focus_manager) {
     focus_manager->AddFocusChangeListener(this);
     listening_to_focus_ = true;
   }
 }
 
 }  // namespace views