diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 17:39:43 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-30 17:39:43 +0000 |
| commit | a3560d4ad6461568cfbfd151027c4558676fbb11 (patch) | |
| tree | d2f4d5ca15eb37f6b96ff646f3865a455a429e6c /ash/system | |
| parent | be887803f4aadfca4828ec11e0aaca75505b4669 (diff) | |
| download | chromium_src-a3560d4ad6461568cfbfd151027c4558676fbb11.zip chromium_src-a3560d4ad6461568cfbfd151027c4558676fbb11.tar.gz chromium_src-a3560d4ad6461568cfbfd151027c4558676fbb11.tar.bz2 | |
ash: Make sure 'restart to update' works correctly with keyboard.
BUG=120988
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9952002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system')
| -rw-r--r-- | ash/system/settings/tray_settings.cc | 2 | ||||
| -rw-r--r-- | ash/system/tray_update.cc | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc index 64f9d70..d561a79 100644 --- a/ash/system/settings/tray_settings.cc +++ b/ash/system/settings/tray_settings.cc @@ -47,7 +47,7 @@ class SettingsView : public views::View { virtual ~SettingsView() {} // Overridden from views::View. - bool OnKeyPressed(const views::KeyEvent& event) { + virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE { if (event.key_code() == ui::VKEY_SPACE || event.key_code() == ui::VKEY_RETURN) { ash::Shell::GetInstance()->tray_delegate()->ShowSettings(); diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc index 82bef41..2854f6b 100644 --- a/ash/system/tray_update.cc +++ b/ash/system/tray_update.cc @@ -42,6 +42,16 @@ class UpdateView : public views::View { virtual ~UpdateView() {} private: + // Overridden from views::View. + virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE { + if (event.key_code() == ui::VKEY_SPACE || + event.key_code() == ui::VKEY_RETURN) { + ash::Shell::GetInstance()->tray_delegate()->RequestRestart(); + return true; + } + return false; + } + virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE { ash::Shell::GetInstance()->tray_delegate()->RequestRestart(); return true; |