Skip to content

Commit

Permalink
Moves NewWindowDelegate to ash/common
Browse files Browse the repository at this point in the history 
And updates accelerators appropriately.

BUG=612331
TEST=none
R=jamescook@chromium.org,stevenjb@chromium.org,reveman@chromium.org
TBR=stevenjb@chromium.org,reveman@chromium.org

Review-Url: https://codereview.chromium.org/2192613002
Cr-Commit-Position: refs/heads/master@{#408264}
  • Loading branch information
sky authored and Commit bot committed Jul 27, 2016
1 parent a2be87f commit a279c7c
Show file tree
Hide file tree
Showing 20 changed files with 235 additions and 154 deletions.
110 changes: 0 additions & 110 deletions ash/accelerators/accelerator_controller_delegate_aura.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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()) {
Expand Down
Loading

0 comments on commit a279c7c

Please sign in to comment.