From 07d294fbdd4efb893929386dadbec71b7ca7429a Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Fri, 18 May 2012 01:27:33 +0000 Subject: 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 --- ash/focus_cycler.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ash/focus_cycler.cc') diff --git a/ash/focus_cycler.cc b/ash/focus_cycler.cc index aa9cf64..f0854c0 100644 --- a/ash/focus_cycler.cc +++ b/ash/focus_cycler.cc @@ -27,11 +27,11 @@ void FocusCycler::AddWidget(views::Widget* widget) { widgets_.push_back(widget); widget->GetFocusManager()->RegisterAccelerator( - ui::Accelerator(ui::VKEY_F2, false, true, false), + ui::Accelerator(ui::VKEY_F2, ui::EF_CONTROL_DOWN), ui::AcceleratorManager::kNormalPriority, this); widget->GetFocusManager()->RegisterAccelerator( - ui::Accelerator(ui::VKEY_F1, false, true, false), + ui::Accelerator(ui::VKEY_F1, ui::EF_CONTROL_DOWN), ui::AcceleratorManager::kNormalPriority, this); } -- cgit v1.1