Chromium Code Reviews| Index: ash/accelerators/accelerator_controller.cc |
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc |
| index 2762f944573416de07351998dba4e09d1683d458..21db25eef94d75998dfeebe5dc8b8fc81131b45f 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,46 @@ bool HandleNewWindow(bool is_incognito) { |
| return true; |
| } |
| +bool HandleOpenBookmarkManager() { |
|
Ben Goodger (Google)
2012/05/23 00:14:14
ash shouldn't know anything about browser commands
|
| + ash::Shell::GetInstance()->delegate()->OpenBookmarkManager(); |
| + return true; |
| +} |
| + |
| +bool HandleOpenClearBrowsingData() { |
|
Ben Goodger (Google)
2012/05/23 00:14:14
or this
|
| + ash::Shell::GetInstance()->delegate()->OpenClearBrowsingData(); |
| + return true; |
| +} |
| + |
| +bool HandleOpenDownloads() { |
|
Ben Goodger (Google)
2012/05/23 00:14:14
or this
|
| + ash::Shell::GetInstance()->delegate()->OpenDownloads(); |
| + return true; |
| +} |
| + |
| +bool HandleOpenHelpPage() { |
|
Ben Goodger (Google)
2012/05/23 00:14:14
or this
|
| + ash::Shell::GetInstance()->delegate()->OpenHelpPage(); |
| + return true; |
| +} |
| + |
| +bool HandleOpenHistory() { |
| + ash::Shell::GetInstance()->delegate()->OpenHistory(); |
| + return true; |
| +} |
| + |
| +bool HandleOpenHome() { |
| + ash::Shell::GetInstance()->delegate()->OpenHome(); |
| + 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( |
| @@ -305,8 +350,24 @@ 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 OPEN_BOOKMARK_MANAGER: |
| + return HandleOpenBookmarkManager(); |
| + case OPEN_CLEAR_BROWSING_DATA: |
| + return HandleOpenClearBrowsingData(); |
| + case OPEN_DOWNLOADS: |
| + return HandleOpenDownloads(); |
| + case OPEN_HELP_PAGE: |
| + return HandleOpenHelpPage(); |
| + case OPEN_HISTORY: |
| + return HandleOpenHistory(); |
| + case OPEN_HOME: |
| + return HandleOpenHome(); |
| + case RESTORE_TAB: |
| + return HandleRestoreTab(); |
| case TAKE_SCREENSHOT: |
| if (screenshot_delegate_.get()) { |
| aura::RootWindow* root_window = Shell::GetRootWindow(); |
| @@ -369,6 +430,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(); |