diff options
| author | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:12:02 +0000 |
|---|---|---|
| committer | stevenjb@google.com <stevenjb@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-30 23:12:02 +0000 |
| commit | 6d6546e0497dae4572bcbf1edbc3950b87046256 (patch) | |
| tree | 0203858fa083a153efb520c1c43d1ee365ec5db8 /ash/accelerators | |
| parent | 43c15cbdfa1af7e5de8ebfcd423b0f84b96795b8 (diff) | |
| download | chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.zip chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.tar.gz chromium_src-6d6546e0497dae4572bcbf1edbc3950b87046256.tar.bz2 | |
Prepare to support Ash notification tray:
* Separate status area widget from system tray
* Support adding multiple trays to status area widget
* Move the background animation into a common base class
BUG=124914
TEST=Status area should look and behave the same as before.
TBR=ben for ash/ OWNER
Review URL: https://chromiumcodereview.appspot.com/10447040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 7 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 2 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 4c87677..3cd9db2 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc @@ -384,9 +384,10 @@ bool AcceleratorController::AcceleratorPressed( if (shell->launcher()) return shell->focus_cycler()->FocusWidget(shell->launcher()->widget()); break; - case FOCUS_TRAY: - if (shell->tray()) - return shell->focus_cycler()->FocusWidget(shell->tray()->GetWidget()); + case FOCUS_SYSTEM_TRAY: + if (shell->system_tray()) + return shell->focus_cycler()->FocusWidget( + shell->system_tray()->GetWidget()); break; case SHOW_KEYBOARD_OVERLAY: ash::Shell::GetInstance()->delegate()->ShowKeyboardOverlay(); diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index b053241..dd64375 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -66,7 +66,7 @@ const AcceleratorData kAcceleratorData[] = { { true, ui::VKEY_F10, ui::EF_NONE, VOLUME_UP }, { 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_TRAY }, + { true, ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, FOCUS_SYSTEM_TRAY }, { true, ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, SHOW_KEYBOARD_OVERLAY }, { true, ui::VKEY_OEM_2, diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h index ef8e234..10d6ef7 100644 --- a/ash/accelerators/accelerator_table.h +++ b/ash/accelerators/accelerator_table.h @@ -22,7 +22,7 @@ enum AcceleratorAction { CYCLE_FORWARD_MRU, EXIT, FOCUS_LAUNCHER, - FOCUS_TRAY, + FOCUS_SYSTEM_TRAY, NEW_INCOGNITO_WINDOW, NEW_TAB, NEW_WINDOW, |