| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 2ee47e7aa692f7bcc391e8f5e3bf9321750eee0a..f09ec9911e83a0ca43c5595b7fcb3f93a733ae58 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -81,6 +81,11 @@ bool HandleExit() {
|
| return true;
|
| }
|
|
|
| +bool HandleNewTab() {
|
| + ash::Shell::GetInstance()->delegate()->NewTab();
|
| + return true;
|
| +}
|
| +
|
| bool HandleNewWindow(bool is_incognito) {
|
| ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
|
| if (!delegate)
|
| @@ -89,6 +94,16 @@ bool HandleNewWindow(bool is_incognito) {
|
| return true;
|
| }
|
|
|
| +bool HandleRestoreTab() {
|
| + ash::Shell::GetInstance()->delegate()->RestoreTab();
|
| + return true;
|
| +}
|
| +
|
| +bool HandleShowTaskManager() {
|
| + ash::Shell::GetInstance()->delegate()->ShowTaskManager();
|
| + return true;
|
| +}
|
| +
|
| // Rotates the default window container.
|
| bool HandleRotateWindows() {
|
| aura::Window* target = ash::Shell::GetInstance()->GetContainer(
|
| @@ -315,8 +330,12 @@ bool AcceleratorController::AcceleratorPressed(
|
| return HandleExit();
|
| case NEW_INCOGNITO_WINDOW:
|
| return HandleNewWindow(true /* is_incognito */);
|
| + case NEW_TAB:
|
| + return HandleNewTab();
|
| case NEW_WINDOW:
|
| return HandleNewWindow(false /* is_incognito */);
|
| + case RESTORE_TAB:
|
| + return HandleRestoreTab();
|
| case TAKE_SCREENSHOT:
|
| if (screenshot_delegate_.get()) {
|
| aura::RootWindow* root_window = Shell::GetRootWindow();
|
| @@ -379,6 +398,8 @@ bool AcceleratorController::AcceleratorPressed(
|
| return true;
|
| }
|
| break;
|
| + case SHOW_TASK_MANAGER:
|
| + return HandleShowTaskManager();
|
| case NEXT_IME:
|
| if (ime_control_delegate_.get())
|
| return ime_control_delegate_->HandleNextIme();
|
|
|