Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Commit

Permalink
Merge "cros: Remove up/down KEY_RELEASED accelerator"
Browse files Browse the repository at this point in the history
> These accelerators break the select popup for CfM OOBE and
> no longer needed for Gaia running inside webview.
>
> BUG=526953
>
> Review URL: https://codereview.chromium.org/1328513004
>
> Cr-Commit-Position: refs/heads/master@{#346727}
> (cherry picked from commit ae8040a)

Review URL: https://codereview.chromium.org/1314783009 .

Cr-Commit-Position: refs/branch-heads/2490@{#162}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
  • Loading branch information
Xiyuan Xia committed Sep 4, 2015
1 parent 10ddae3 commit 8f757d2
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions chrome/browser/chromeos/login/ui/webui_login_view.cc
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,6 @@ WebUILoginView::WebUILoginView()
accel_map_[ui::Accelerator(ui::VKEY_RIGHT, ui::EF_NONE)] =
kAccelFocusNext;

// Use KEY_RELEASED because Gaia consumes KEY_PRESSED for up/down key.
ui::Accelerator key_up(ui::VKEY_UP, ui::EF_NONE);
key_up.set_type(ui::ET_KEY_RELEASED);
ui::Accelerator key_down(ui::VKEY_DOWN, ui::EF_NONE);
key_down.set_type(ui::ET_KEY_RELEASED);
accel_map_[key_up] = kAccelFocusPrev;
accel_map_[key_down] = kAccelFocusNext;

accel_map_[ui::Accelerator(
ui::VKEY_D, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN)] =
kAccelNameDeviceRequisition;
Expand Down

0 comments on commit 8f757d2

Please sign in to comment.