Pass event bitmask (shift, control, alt) to ui::Accelerator instead of booleans.

BUG=128242
R=ben@chromium.org
TBR=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10399044

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137792 0039d316-1c4b-4281-b951-d872f2087c98

19 files changed, 86 insertions, 47 deletions

diff --git a/ui/base/events.h b/ui/base/events.h
index 74cfd63..3408f4b 100644
--- a/ui/base/events.h
+++ b/ui/base/events.h
@@ -10,6 +10,10 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/native_widget_types.h"
 
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
 namespace gfx {
 class Point;
 }
@@ -201,6 +205,10 @@ UI_EXPORT bool IsNoopEvent(const base::NativeEvent& event);
 // Creates and returns no-op event.
 UI_EXPORT base::NativeEvent CreateNoopEvent();
 
+#if defined(OS_WIN)
+int GetModifiersFromACCEL(const ACCEL& accel);
+#endif
+
 }  // namespace ui
 
 #endif  // UI_BASE_EVENTS_H_
diff --git a/ui/base/win/events_win.cc b/ui/base/win/events_win.cc
index 9f75b6f..a014ce0 100644
--- a/ui/base/win/events_win.cc
+++ b/ui/base/win/events_win.cc
@@ -300,4 +300,15 @@ base::NativeEvent CreateNoopEvent() {
   return event;
 }
 
+int GetModifiersFromACCEL(const ACCEL& accel) {
+  int modifiers = ui::EF_NONE;
+  if (accel.fVirt & FSHIFT)
+    modifiers |= ui::EF_SHIFT_DOWN;
+  if (accel.fVirt & FCONTROL)
+    modifiers |= ui::EF_CONTROL_DOWN;
+  if (accel.fVirt & FALT)
+    modifiers |= ui::EF_ALT_DOWN;
+  return modifiers;
+}
+
 }  // namespace ui
diff --git a/ui/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc
index 0849c36..ab12435 100644
--- a/ui/views/accessible_pane_view.cc
+++ b/ui/views/accessible_pane_view.cc
@@ -16,11 +16,11 @@ AccessiblePaneView::AccessiblePaneView()
     : pane_has_focus_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),
       focus_manager_(NULL),
-      home_key_(ui::VKEY_HOME, false, false, false),
-      end_key_(ui::VKEY_END, false, false, false),
-      escape_key_(ui::VKEY_ESCAPE, false, false, false),
-      left_key_(ui::VKEY_LEFT, false, false, false),
-      right_key_(ui::VKEY_RIGHT, false, false, false) {
+      home_key_(ui::VKEY_HOME, ui::EF_NONE),
+      end_key_(ui::VKEY_END, ui::EF_NONE),
+      escape_key_(ui::VKEY_ESCAPE, ui::EF_NONE),
+      left_key_(ui::VKEY_LEFT, ui::EF_NONE),
+      right_key_(ui::VKEY_RIGHT, ui::EF_NONE) {
   focus_search_.reset(new views::FocusSearch(this, true, true));
 }
 
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index 92645a8..5dc3fcb 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -116,7 +116,7 @@ BubbleDelegateView::BubbleDelegateView()
       use_focusless_(false),
       parent_window_(NULL) {
   set_background(views::Background::CreateSolidBackground(color_));
-  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
+  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::BubbleDelegateView(
@@ -135,7 +135,7 @@ BubbleDelegateView::BubbleDelegateView(
       use_focusless_(false),
       parent_window_(NULL) {
   set_background(views::Background::CreateSolidBackground(color_));
-  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, 0));
+  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
 BubbleDelegateView::~BubbleDelegateView() {}
diff --git a/ui/views/controls/button/text_button.cc b/ui/views/controls/button/text_button.cc
index 1e616da..c44b65e 100644
--- a/ui/views/controls/button/text_button.cc
+++ b/ui/views/controls/button/text_button.cc
@@ -285,9 +285,9 @@ void TextButtonBase::SetIsDefault(bool is_default) {
     return;
   is_default_ = is_default;
   if (is_default_)
-    AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, false, false, false));
+    AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   else
-    RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, false, false, false));
+    RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   SchedulePaint();
 }
 
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 05713b8..2fd1bb9 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -1061,7 +1061,7 @@ MenuController::SendAcceleratorResultType
   if (!hot_view)
     return ACCELERATOR_NOT_PROCESSED;
 
-  ui::Accelerator accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   hot_view->AcceleratorPressed(accelerator);
   if (hot_view->GetClassName() == CustomButton::kViewClassName) {
     CustomButton* button = static_cast<CustomButton*>(hot_view);
diff --git a/ui/views/controls/menu/menu_win.cc b/ui/views/controls/menu/menu_win.cc
index 6536ef1..564fd5c 100644
--- a/ui/views/controls/menu/menu_win.cc
+++ b/ui/views/controls/menu/menu_win.cc
@@ -440,7 +440,7 @@ void MenuWin::AddMenuItemInternal(int index,
   string16 actual_label(label.empty() ? delegate()->GetLabel(item_id) : label);
 
   // Find out if there is a shortcut we need to append to the label.
-  ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
+  ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
   if (delegate() && delegate()->GetAcceleratorInfo(item_id, &accelerator)) {
     actual_label += L'\t';
     actual_label += accelerator.GetShortcutText();
diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc
index 8a9ab0c..2b4af01 100644
--- a/ui/views/controls/menu/native_menu_win.cc
+++ b/ui/views/controls/menu/native_menu_win.cc
@@ -691,7 +691,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString(MENUITEMINFO* mii,
   ReplaceSubstringsAfterOffset(&formatted, 0, L"\t", L" ");
   if (type != ui::MenuModel::TYPE_SUBMENU) {
     // Add accelerator details to the label if provided.
-    ui::Accelerator accelerator(ui::VKEY_UNKNOWN, false, false, false);
+    ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE);
     if (model_->GetAcceleratorAt(model_index, &accelerator)) {
       formatted += L"\t";
       formatted += accelerator.GetShortcutText();
diff --git a/ui/views/controls/tabbed_pane/tabbed_pane.cc b/ui/views/controls/tabbed_pane/tabbed_pane.cc
index 5e874f1..b5dc08d 100644
--- a/ui/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/ui/views/controls/tabbed_pane/tabbed_pane.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -71,9 +71,10 @@ gfx::Size TabbedPane::GetPreferredSize() {
 
 void TabbedPane::LoadAccelerators() {
   // Ctrl+Shift+Tab
-  AddAccelerator(ui::Accelerator(ui::VKEY_TAB, true, true, false));
+  AddAccelerator(ui::Accelerator(ui::VKEY_TAB,
+                                 ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN));
   // Ctrl+Tab
-  AddAccelerator(ui::Accelerator(ui::VKEY_TAB, false, true, false));
+  AddAccelerator(ui::Accelerator(ui::VKEY_TAB, ui::EF_CONTROL_DOWN));
 }
 
 void TabbedPane::Layout() {
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index f6119de7..3744d977 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -427,13 +427,13 @@ bool NativeTextfieldWin::GetAcceleratorForCommandId(int command_id,
   // anywhere so we need to check for them explicitly here.
   switch (command_id) {
     case IDS_APP_CUT:
-      *accelerator = ui::Accelerator(ui::VKEY_X, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_X, ui::EF_CONTROL_DOWN);
       return true;
     case IDS_APP_COPY:
-      *accelerator = ui::Accelerator(ui::VKEY_C, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_C, ui::EF_CONTROL_DOWN);
       return true;
     case IDS_APP_PASTE:
-      *accelerator = ui::Accelerator(ui::VKEY_V, false, true, false);
+      *accelerator = ui::Accelerator(ui::VKEY_V, ui::EF_CONTROL_DOWN);
       return true;
   }
   return container_view_->GetWidget()->GetAccelerator(command_id, accelerator);
diff --git a/ui/views/controls/tree/tree_view_win.cc b/ui/views/controls/tree/tree_view_win.cc
index 0547f6a..a878432 100644
--- a/ui/views/controls/tree/tree_view_win.cc
+++ b/ui/views/controls/tree/tree_view_win.cc
@@ -472,10 +472,7 @@ bool TreeView::OnKeyDown(ui::KeyboardCode virtual_key_code) {
   } else if (virtual_key_code == ui::VKEY_RETURN && !process_enter_) {
     Widget* widget = GetWidget();
     DCHECK(widget);
-    ui::Accelerator accelerator(ui::Accelerator(virtual_key_code,
-                                                base::win::IsShiftPressed(),
-                                                base::win::IsCtrlPressed(),
-                                                base::win::IsAltPressed()));
+    ui::Accelerator accelerator(virtual_key_code, GetModifiersFromKeyState());
     GetFocusManager()->ProcessAccelerator(accelerator);
     return true;
   }
diff --git a/ui/views/events/event.h b/ui/views/events/event.h
index 425bb1c..af4a06a 100644
--- a/ui/views/events/event.h
+++ b/ui/views/events/event.h
@@ -447,6 +447,10 @@ class VIEWS_EXPORT GestureEventForTest : public GestureEvent {
   DISALLOW_COPY_AND_ASSIGN(GestureEventForTest);
 };
 
+#if defined(OS_WIN)
+int GetModifiersFromKeyState();
+#endif
+
 }  // namespace views
 
 #endif  // UI_VIEWS_EVENTS_EVENT_H_
diff --git a/ui/views/events/event_win.cc b/ui/views/events/event_win.cc
index 82a83ed..4143f54 100644
--- a/ui/views/events/event_win.cc
+++ b/ui/views/events/event_win.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/events/event.h"
 
 #include "base/logging.h"
+#include "base/win/win_util.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 
 namespace views {
@@ -27,4 +28,15 @@ uint16 KeyEvent::GetUnmodifiedCharacter() const {
       ui::GetCharacterFromKeyCode(key_code_, flags() & ui::EF_SHIFT_DOWN);
 }
 
+int GetModifiersFromKeyState() {
+  int modifiers = ui::EF_NONE;
+  if (base::win::IsShiftPressed())
+    modifiers |= ui::EF_SHIFT_DOWN;
+  if (base::win::IsCtrlPressed())
+    modifiers |= ui::EF_CONTROL_DOWN;
+  if (base::win::IsAltPressed())
+    modifiers |= ui::EF_ALT_DOWN;
+  return modifiers;
+}
+
 }  // namespace views
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 1799831..3c2c8d7 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -66,7 +66,7 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
              (event.flags() & ~ui::EF_ALT_DOWN) == 0) {
     // Trigger VKEY_MENU when only this key is pressed and released, and both
     // press and release events are not handled by others.
-    ui::Accelerator accelerator(ui::VKEY_MENU, false, false, false);
+    ui::Accelerator accelerator(ui::VKEY_MENU, ui::EF_NONE);
     return ProcessAccelerator(accelerator);
   } else if (event.type() != ui::ET_KEY_RELEASED) {
     return false;
@@ -76,10 +76,14 @@ bool FocusManager::OnKeyEvent(const KeyEvent& event) {
     return false;
 #endif
 
-  ui::Accelerator accelerator(event.key_code(),
-                              event.IsShiftDown(),
-                              event.IsControlDown(),
-                              event.IsAltDown());
+  int modifiers = ui::EF_NONE;
+  if (event.IsShiftDown())
+    modifiers |= ui::EF_SHIFT_DOWN;
+  if (event.IsControlDown())
+    modifiers |= ui::EF_CONTROL_DOWN;
+  if (event.IsAltDown())
+    modifiers |= ui::EF_ALT_DOWN;
+  ui::Accelerator accelerator(event.key_code(), modifiers);
   accelerator.set_type(event.type());
 
   if (event.type() == ui::ET_KEY_PRESSED) {
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index 06b8448..b121e44 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -214,8 +214,8 @@ class TestAcceleratorTarget : public ui::AcceleratorTarget {
 
 TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
   FocusManager* focus_manager = GetFocusManager();
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
-  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
+  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
 
   TestAcceleratorTarget return_target(true);
   TestAcceleratorTarget escape_target(true);
@@ -314,7 +314,7 @@ TEST_F(FocusManagerTest, CallsNormalAcceleratorTarget) {
 
 TEST_F(FocusManagerTest, HighPriorityHandlers) {
   FocusManager* focus_manager = GetFocusManager();
-  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
+  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
 
   TestAcceleratorTarget escape_target_high(true);
   TestAcceleratorTarget escape_target_normal(true);
@@ -403,7 +403,7 @@ TEST_F(FocusManagerTest, HighPriorityHandlers) {
 
 TEST_F(FocusManagerTest, CallsEnabledAcceleratorTargetsOnly) {
   FocusManager* focus_manager = GetFocusManager();
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
 
   TestAcceleratorTarget return_target1(true);
   TestAcceleratorTarget return_target2(true);
@@ -471,7 +471,7 @@ class SelfUnregisteringAcceleratorTarget : public ui::AcceleratorTarget {
 
 TEST_F(FocusManagerTest, CallsSelfDeletingAcceleratorTarget) {
   FocusManager* focus_manager = GetFocusManager();
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   SelfUnregisteringAcceleratorTarget target(return_accelerator, focus_manager);
   EXPECT_EQ(target.accelerator_count(), 0);
   EXPECT_EQ(NULL,
diff --git a/ui/views/focus/focus_manager_unittest_win.cc b/ui/views/focus/focus_manager_unittest_win.cc
index d6a9882..2a18e54 100644
--- a/ui/views/focus/focus_manager_unittest_win.cc
+++ b/ui/views/focus/focus_manager_unittest_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -206,8 +206,8 @@ TEST_F(FocusManagerTest, CreationForNativeRoot) {
 TEST_F(FocusManagerTest, IgnoreKeyupForAccelerators) {
   FocusManager* focus_manager = GetFocusManager();
   MessageTrackingView* mtv = new MessageTrackingView();
-  mtv->AddAccelerator(ui::Accelerator(ui::VKEY_0, false, false, false));
-  mtv->AddAccelerator(ui::Accelerator(ui::VKEY_1, false, false, false));
+  mtv->AddAccelerator(ui::Accelerator(ui::VKEY_0, ui::EF_NONE));
+  mtv->AddAccelerator(ui::Accelerator(ui::VKEY_1, ui::EF_NONE));
   GetContentsView()->AddChildView(mtv);
   focus_manager->SetFocusedView(mtv);
 
diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc
index 71b606f..3ebd39e 100644
--- a/ui/views/view_unittest.cc
+++ b/ui/views/view_unittest.cc
@@ -1129,7 +1129,7 @@ bool TestView::AcceleratorPressed(const ui::Accelerator& accelerator) {
 #if defined(OS_WIN) && !defined(USE_AURA)
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
@@ -1154,7 +1154,7 @@ TEST_F(ViewTest, ActivateAccelerator) {
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
 
   // Hit the escape key. Nothing should happen.
-  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
+  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, ui::EF_NONE);
   EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
   EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 0);
@@ -1195,7 +1195,7 @@ TEST_F(ViewTest, ActivateAccelerator) {
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 TEST_F(ViewTest, HiddenViewWithAccelerator) {
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
@@ -1225,7 +1225,7 @@ TEST_F(ViewTest, HiddenViewWithAccelerator) {
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 TEST_F(ViewTest, ViewInHiddenWidgetWithAccelerator) {
-  ui::Accelerator return_accelerator(ui::VKEY_RETURN, false, false, false);
+  ui::Accelerator return_accelerator(ui::VKEY_RETURN, ui::EF_NONE);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc
index 7e53c8e..a5f9b9c 100644
--- a/ui/views/widget/native_widget_win.cc
+++ b/ui/views/widget/native_widget_win.cc
@@ -2025,12 +2025,15 @@ void NativeWidgetWin::OnSysCommand(UINT notification_code, CPoint click) {
   // Handle SC_KEYMENU, which means that the user has pressed the ALT
   // key and released it, so we should focus the menu bar.
   if ((notification_code & sc_mask) == SC_KEYMENU && click.x == 0) {
+    int modifiers = ui::EF_NONE;
+    if (!!(GetKeyState(VK_SHIFT) & 0x8000))
+      modifiers |= ui::EF_SHIFT_DOWN;
+    if (!!(GetKeyState(VK_CONTROL) & 0x8000))
+      modifiers |= ui::EF_CONTROL_DOWN;
     // Retrieve the status of shift and control keys to prevent consuming
     // shift+alt keys, which are used by Windows to change input languages.
     ui::Accelerator accelerator(ui::KeyboardCodeForWindowsKeyCode(VK_MENU),
-                                !!(GetKeyState(VK_SHIFT) & 0x8000),
-                                !!(GetKeyState(VK_CONTROL) & 0x8000),
-                                false);
+                                modifiers);
     GetWidget()->GetFocusManager()->ProcessAccelerator(accelerator);
     return;
   }
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 1cf1d670..c5c50cd 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -132,8 +132,7 @@ void DialogClientView::ShowDialogButtons() {
     if (is_default_button)
       default_button_ = ok_button_;
     if (!(buttons & ui::DIALOG_BUTTON_CANCEL))
-      ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
-                                                 false, false, false));
+      ok_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
     AddChildView(ok_button_);
   }
   if (buttons & ui::DIALOG_BUTTON_CANCEL && !cancel_button_) {
@@ -156,7 +155,7 @@ void DialogClientView::ShowDialogButtons() {
                                       is_default_button);
     cancel_button_->SetGroup(kButtonGroup);
     cancel_button_->AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE,
-                                                   false, false, false));
+                                                   ui::EF_NONE));
     if (is_default_button)
       default_button_ = ok_button_;
     AddChildView(cancel_button_);
@@ -164,7 +163,7 @@ void DialogClientView::ShowDialogButtons() {
   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, false, false, false));
+    AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
   }
 }