diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 01:27:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 01:27:33 +0000 |
| commit | 07d294fbdd4efb893929386dadbec71b7ca7429a (patch) | |
| tree | d1af46a7c8966f116ca292d10f636fe0518f6cb0 /ash/focus_cycler.cc | |
| parent | d79c13b4be9fe89b1f81bdde8ed0257b2ca6e4e0 (diff) | |
| download | chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.zip chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.gz chromium_src-07d294fbdd4efb893929386dadbec71b7ca7429a.tar.bz2 | |
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
Diffstat (limited to 'ash/focus_cycler.cc')
| -rw-r--r-- | ash/focus_cycler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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); } |