diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 23:58:58 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-06 23:58:58 +0000 |
| commit | 12be277710ff5ace6366e26fd564acd70b8ee2b7 (patch) | |
| tree | 245173440f85fa7f4b43e073a806acc608ead62f /ash/accelerators | |
| parent | 8a2166d908e2ce92c4c4aa408309b7b594519418 (diff) | |
| download | chromium_src-12be277710ff5ace6366e26fd564acd70b8ee2b7.zip chromium_src-12be277710ff5ace6366e26fd564acd70b8ee2b7.tar.gz chromium_src-12be277710ff5ace6366e26fd564acd70b8ee2b7.tar.bz2 | |
Make Shift+Alt+S to show the system tray bubble.
BUG=157983
Review URL: https://chromiumcodereview.appspot.com/11443026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 13 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 3 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.h | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index cd62a95..5a67366 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -623,15 +623,6 @@ bool AcceleratorController::PerformAction(int action, return HandleRotatePaneFocus(Shell::FORWARD); case FOCUS_PREVIOUS_PANE: return HandleRotatePaneFocus(Shell::BACKWARD); - case FOCUS_SYSTEM_TRAY: { - internal::StatusAreaWidget* status_area = - ash::Shell::GetInstance()->status_area_widget(); - if (status_area) { - return shell->focus_cycler()->FocusWidget( - status_area->system_tray()->GetWidget()); - } - break; - } case SHOW_KEYBOARD_OVERLAY: ash::Shell::GetInstance()->delegate()->ShowKeyboardOverlay(); return true; @@ -642,6 +633,10 @@ bool AcceleratorController::PerformAction(int action, return true; } break; + case SHOW_SYSTEM_TRAY_BUBBLE: + if (!shell->system_tray()->HasSystemBubble()) + shell->system_tray()->ShowDefaultView(BUBBLE_CREATE_NEW); + break; case SHOW_TASK_MANAGER: Shell::GetInstance()->delegate()->ShowTaskManager(); return true; diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index ee8772e..c84c409 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -115,7 +115,6 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_VOLUME_DOWN, ui::EF_NONE, VOLUME_DOWN }, { true, ui::VKEY_VOLUME_UP, ui::EF_NONE, VOLUME_UP }, { true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_LAUNCHER }, - { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, { true, ui::VKEY_HELP, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, SHOW_KEYBOARD_OVERLAY }, @@ -125,6 +124,8 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_F14, ui::EF_NONE, SHOW_KEYBOARD_OVERLAY }, { true, ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, SHOW_OAK }, + { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, + SHOW_SYSTEM_TRAY_BUBBLE }, { true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER }, { true, ui::VKEY_1, ui::EF_ALT_DOWN, SELECT_WIN_0 }, { true, ui::VKEY_2, ui::EF_ALT_DOWN, SELECT_WIN_1 }, diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h index 53492e9..4747bdb 100644 --- a/ash/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h @@ -27,7 +27,6 @@ enum AcceleratorAction { FOCUS_LAUNCHER, FOCUS_NEXT_PANE, FOCUS_PREVIOUS_PANE, - FOCUS_SYSTEM_TRAY, KEYBOARD_BRIGHTNESS_DOWN, KEYBOARD_BRIGHTNESS_UP, LOCK_PRESSED, @@ -59,6 +58,7 @@ enum AcceleratorAction { SELECT_WIN_7, SHOW_KEYBOARD_OVERLAY, SHOW_OAK, + SHOW_SYSTEM_TRAY_BUBBLE, SHOW_TASK_MANAGER, SWAP_PRIMARY_DISPLAY, SWITCH_IME, // Switch to another IME depending on the accelerator. |