Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: ash/accelerators/accelerator_controller_delegate_aura.cc

Issue 2192613002: Moves NewWindowDelegate to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller_delegate_aura.cc
diff --git a/ash/accelerators/accelerator_controller_delegate_aura.cc b/ash/accelerators/accelerator_controller_delegate_aura.cc
index 538e4a43f44c18ea7eaec19b8057d9e93cac272b..d6e5258b255a098e870d662c210fd694330f4437 100644
--- a/ash/accelerators/accelerator_controller_delegate_aura.cc
+++ b/ash/accelerators/accelerator_controller_delegate_aura.cc
@@ -35,7 +35,6 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/magnifier/magnification_controller.h"
#include "ash/magnifier/partial_magnification_controller.h"
-#include "ash/new_window_delegate.h"
#include "ash/root_window_controller.h"
#include "ash/rotator/screen_rotation_animator.h"
#include "ash/rotator/window_rotation.h"
@@ -180,38 +179,6 @@ void HandleMagnifyScreen(int delta_index) {
}
}
-bool CanHandleNewIncognitoWindow() {
- return WmShell::Get()->delegate()->IsIncognitoAllowed();
-}
-
-void HandleNewIncognitoWindow() {
- base::RecordAction(UserMetricsAction("Accel_New_Incognito_Window"));
- Shell::GetInstance()->new_window_delegate()->NewWindow(
- true /* is_incognito */);
-}
-
-void HandleNewTab(const ui::Accelerator& accelerator) {
- if (accelerator.key_code() == ui::VKEY_T)
- base::RecordAction(UserMetricsAction("Accel_NewTab_T"));
- Shell::GetInstance()->new_window_delegate()->NewTab();
-}
-
-void HandleNewWindow() {
- base::RecordAction(UserMetricsAction("Accel_New_Window"));
- Shell::GetInstance()->new_window_delegate()->NewWindow(
- false /* is_incognito */);
-}
-
-void HandleOpenFeedbackPage() {
- base::RecordAction(UserMetricsAction("Accel_Open_Feedback_Page"));
- Shell::GetInstance()->new_window_delegate()->OpenFeedbackPage();
-}
-
-void HandleRestoreTab() {
- base::RecordAction(UserMetricsAction("Accel_Restore_Tab"));
- Shell::GetInstance()->new_window_delegate()->RestoreTab();
-}
-
display::Display::Rotation GetNextRotation(display::Display::Rotation current) {
switch (current) {
case display::Display::ROTATE_0:
@@ -260,11 +227,6 @@ void HandleRotateActiveWindow() {
}
}
-void HandleShowKeyboardOverlay() {
- base::RecordAction(UserMetricsAction("Accel_Show_Keyboard_Overlay"));
- Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
-}
-
bool CanHandleShowMessageCenterBubble() {
RootWindowController* controller =
RootWindowController::ForTargetRootWindow();
@@ -296,11 +258,6 @@ void HandleShowSystemTrayBubble() {
controller->GetSystemTray()->ShowDefaultView(BUBBLE_CREATE_NEW);
}
-void HandleShowTaskManager() {
- base::RecordAction(UserMetricsAction("Accel_Show_Task_Manager"));
- Shell::GetInstance()->new_window_delegate()->ShowTaskManager();
-}
-
void HandleTakeWindowScreenshot(ScreenshotDelegate* screenshot_delegate) {
base::RecordAction(UserMetricsAction("Accel_Take_Window_Screenshot"));
DCHECK(screenshot_delegate);
@@ -398,22 +355,6 @@ bool CanHandleUnpin() {
}
#if defined(OS_CHROMEOS)
-void HandleCrosh() {
- base::RecordAction(UserMetricsAction("Accel_Open_Crosh"));
-
- Shell::GetInstance()->new_window_delegate()->OpenCrosh();
-}
-
-void HandleFileManager() {
- base::RecordAction(UserMetricsAction("Accel_Open_File_Manager"));
-
- Shell::GetInstance()->new_window_delegate()->OpenFileManager();
-}
-
-void HandleGetHelp() {
- Shell::GetInstance()->new_window_delegate()->OpenGetHelp();
-}
-
void HandleSwapPrimaryDisplay() {
base::RecordAction(UserMetricsAction("Accel_Swap_Primary_Display"));
Shell::GetInstance()->display_configuration_controller()->SetPrimaryDisplayId(
@@ -475,20 +416,13 @@ bool AcceleratorControllerDelegateAura::HandlesAction(
case LAUNCH_LAST_APP:
case MAGNIFY_SCREEN_ZOOM_IN:
case MAGNIFY_SCREEN_ZOOM_OUT:
- case NEW_INCOGNITO_WINDOW:
- case NEW_TAB:
- case NEW_WINDOW:
- case OPEN_FEEDBACK_PAGE:
- case RESTORE_TAB:
case ROTATE_SCREEN:
case ROTATE_WINDOW:
case SCALE_UI_DOWN:
case SCALE_UI_RESET:
case SCALE_UI_UP:
- case SHOW_KEYBOARD_OVERLAY:
case SHOW_MESSAGE_CENTER_BUBBLE:
case SHOW_SYSTEM_TRAY_BUBBLE:
- case SHOW_TASK_MANAGER:
case TAKE_PARTIAL_SCREENSHOT:
case TAKE_SCREENSHOT:
case TAKE_WINDOW_SCREENSHOT:
@@ -502,9 +436,6 @@ bool AcceleratorControllerDelegateAura::HandlesAction(
case DISABLE_GPU_WATCHDOG:
case LOCK_PRESSED:
case LOCK_RELEASED:
- case OPEN_CROSH:
- case OPEN_FILE_MANAGER:
- case OPEN_GET_HELP:
case POWER_PRESSED:
case POWER_RELEASED:
case SWAP_PRIMARY_DISPLAY:
@@ -536,8 +467,6 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
case MAGNIFY_SCREEN_ZOOM_IN:
case MAGNIFY_SCREEN_ZOOM_OUT:
return CanHandleMagnifyScreen();
- case NEW_INCOGNITO_WINDOW:
- return CanHandleNewIncognitoWindow();
case SCALE_UI_DOWN:
case SCALE_UI_RESET:
case SCALE_UI_UP:
@@ -560,15 +489,9 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
case LAUNCH_APP_6:
case LAUNCH_APP_7:
case LAUNCH_LAST_APP:
- case NEW_TAB:
- case NEW_WINDOW:
- case OPEN_FEEDBACK_PAGE:
- case RESTORE_TAB:
case ROTATE_SCREEN:
case ROTATE_WINDOW:
- case SHOW_KEYBOARD_OVERLAY:
case SHOW_SYSTEM_TRAY_BUBBLE:
- case SHOW_TASK_MANAGER:
case TAKE_PARTIAL_SCREENSHOT:
case TAKE_SCREENSHOT:
case TAKE_WINDOW_SCREENSHOT:
@@ -589,9 +512,6 @@ bool AcceleratorControllerDelegateAura::CanPerformAction(
case DISABLE_GPU_WATCHDOG:
case LOCK_PRESSED:
case LOCK_RELEASED:
- case OPEN_CROSH:
- case OPEN_FILE_MANAGER:
- case OPEN_GET_HELP:
case POWER_PRESSED:
case POWER_RELEASED:
case TOGGLE_MIRROR_MODE:
@@ -664,21 +584,6 @@ void AcceleratorControllerDelegateAura::PerformAction(
case MAGNIFY_SCREEN_ZOOM_OUT:
HandleMagnifyScreen(-1);
break;
- case NEW_INCOGNITO_WINDOW:
- HandleNewIncognitoWindow();
- break;
- case NEW_TAB:
- HandleNewTab(accelerator);
- break;
- case NEW_WINDOW:
- HandleNewWindow();
- break;
- case OPEN_FEEDBACK_PAGE:
- HandleOpenFeedbackPage();
- break;
- case RESTORE_TAB:
- HandleRestoreTab();
- break;
case ROTATE_SCREEN:
HandleRotateScreen();
break;
@@ -694,18 +599,12 @@ void AcceleratorControllerDelegateAura::PerformAction(
case SCALE_UI_UP:
accelerators::ZoomInternalDisplay(true /* up */);
break;
- case SHOW_KEYBOARD_OVERLAY:
- HandleShowKeyboardOverlay();
- break;
case SHOW_MESSAGE_CENTER_BUBBLE:
HandleShowMessageCenterBubble();
break;
case SHOW_SYSTEM_TRAY_BUBBLE:
HandleShowSystemTrayBubble();
break;
- case SHOW_TASK_MANAGER:
- HandleShowTaskManager();
- break;
case TAKE_PARTIAL_SCREENSHOT:
HandleTakePartialScreenshot(screenshot_delegate_.get());
break;
@@ -737,15 +636,6 @@ void AcceleratorControllerDelegateAura::PerformAction(
Shell::GetInstance()->power_button_controller()->OnLockButtonEvent(
action == LOCK_PRESSED, base::TimeTicks());
break;
- case OPEN_CROSH:
- HandleCrosh();
- break;
- case OPEN_FILE_MANAGER:
- HandleFileManager();
- break;
- case OPEN_GET_HELP:
- HandleGetHelp();
- break;
case POWER_PRESSED: // fallthrough
case POWER_RELEASED:
if (!base::SysInfo::IsRunningOnChromeOS()) {
« no previous file with comments | « no previous file | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698