Moves NewWindowDelegate to ash/common

ash/accelerators/accelerator_controller_delegate_aura.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
@@ skipping 17 matching lines @@
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/debug.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/window_tree_host_manager.h"
 #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"
 #include "ash/screen_util.h"
 #include "ash/screenshot_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_hud_debug.h"
 #include "ash/utility/screenshot_controller.h"
@@ skipping 124 matching lines @@
     Shell::GetInstance()->magnification_controller()->SetScale(
         std::pow(kMagnificationScaleFactor, new_scale_index), true);
   } else if (Shell::GetInstance()
                  ->partial_magnification_controller()
                  ->is_enabled()) {
     float scale = delta_index > 0 ? kDefaultPartialMagnifiedScale : 1;
     Shell::GetInstance()->partial_magnification_controller()->SetScale(scale);
   }
 }
 
-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:
       return display::Display::ROTATE_90;
     case display::Display::ROTATE_90:
       return display::Display::ROTATE_180;
     case display::Display::ROTATE_180:
       return display::Display::ROTATE_270;
     case display::Display::ROTATE_270:
       return display::Display::ROTATE_0;
@@ skipping 28 matching lines @@
     // right now, queue this animation so when it starts it picks up a neutral
     // rotation and position. Use replace so we only enqueue one at a time.
     active_window->layer()->GetAnimator()->set_preemption_strategy(
         ui::LayerAnimator::REPLACE_QUEUED_ANIMATIONS);
     active_window->layer()->GetAnimator()->StartAnimation(
         new ui::LayerAnimationSequence(
             new WindowRotation(360, active_window->layer())));
   }
 }
 
-void HandleShowKeyboardOverlay() {
-  base::RecordAction(UserMetricsAction("Accel_Show_Keyboard_Overlay"));
-  Shell::GetInstance()->new_window_delegate()->ShowKeyboardOverlay();
-}
-
 bool CanHandleShowMessageCenterBubble() {
   RootWindowController* controller =
       RootWindowController::ForTargetRootWindow();
   StatusAreaWidget* status_area_widget =
       controller->shelf_widget()->status_area_widget();
   return status_area_widget &&
          status_area_widget->web_notification_tray()->visible();
 }
 
 void HandleShowMessageCenterBubble() {
@@ skipping 11 matching lines @@
 }
 
 void HandleShowSystemTrayBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_System_Tray_Bubble"));
   RootWindowController* controller =
       RootWindowController::ForTargetRootWindow();
   if (!controller->GetSystemTray()->HasSystemBubble())
     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);
   Shell::GetInstance()->screenshot_controller()->StartWindowScreenshotSession(
       screenshot_delegate);
 }
 
 void HandleTakePartialScreenshot(ScreenshotDelegate* screenshot_delegate) {
   base::RecordAction(UserMetricsAction("Accel_Take_Partial_Screenshot"));
   DCHECK(screenshot_delegate);
@@ skipping 77 matching lines @@
       break;
   }
 }
 
 bool CanHandleUnpin() {
   wm::WindowState* window_state = wm::GetActiveWindowState();
   return window_state && window_state->IsPinned();
 }
 
 #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(
       ScreenUtil::GetSecondaryDisplay().id(), true /* user_action */);
 }
 
 void HandleToggleMirrorMode() {
   base::RecordAction(UserMetricsAction("Accel_Toggle_Mirror_Mode"));
   bool mirror = !Shell::GetInstance()->display_manager()->IsInMirrorMode();
   Shell::GetInstance()->display_configuration_controller()->SetMirrorMode(
@@ skipping 41 matching lines @@
     case LAUNCH_APP_1:
     case LAUNCH_APP_2:
     case LAUNCH_APP_3:
     case LAUNCH_APP_4:
     case LAUNCH_APP_5:
     case LAUNCH_APP_6:
     case LAUNCH_APP_7:
     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:
     case TOGGLE_APP_LIST:
     case UNPIN:
       return true;
 
 #if defined(OS_CHROMEOS)
     case DEBUG_ADD_REMOVE_DISPLAY:
     case DEBUG_TOGGLE_UNIFIED_DESKTOP:
     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:
     case TOGGLE_MIRROR_MODE:
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
 #endif
 
@@ skipping 11 matching lines @@
     case DEBUG_TOGGLE_DESKTOP_BACKGROUND_MODE:
     case DEBUG_TOGGLE_DEVICE_SCALE_FACTOR:
     case DEBUG_TOGGLE_ROOT_WINDOW_FULL_SCREEN:
     case DEBUG_TOGGLE_SHOW_DEBUG_BORDERS:
     case DEBUG_TOGGLE_SHOW_FPS_COUNTER:
     case DEBUG_TOGGLE_SHOW_PAINT_RECTS:
       return debug::DebugAcceleratorsEnabled();
     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:
       return accelerators::IsInternalDisplayZoomEnabled();
     case SHOW_MESSAGE_CENTER_BUBBLE:
       return CanHandleShowMessageCenterBubble();
     case TOGGLE_APP_LIST:
       return CanHandleToggleAppList(accelerator, previous_accelerator);
     case UNPIN:
       return CanHandleUnpin();
 
     // Following are always enabled:
     case FOCUS_SHELF:
     case LAUNCH_APP_0:
     case LAUNCH_APP_1:
     case LAUNCH_APP_2:
     case LAUNCH_APP_3:
     case LAUNCH_APP_4:
     case LAUNCH_APP_5:
     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:
       return true;
 
 #if defined(OS_CHROMEOS)
     case DEBUG_ADD_REMOVE_DISPLAY:
     case DEBUG_TOGGLE_UNIFIED_DESKTOP:
       return debug::DebugAcceleratorsEnabled();
 
     case SWAP_PRIMARY_DISPLAY:
       return display::Screen::GetScreen()->GetNumDisplays() > 1;
     case TOUCH_HUD_CLEAR:
     case TOUCH_HUD_MODE_CHANGE:
       return CanHandleTouchHud();
 
     // Following are always enabled.
     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:
     case TOUCH_HUD_PROJECTION_TOGGLE:
       return true;
 #endif
 
     default:
       NOTREACHED();
       break;
@@ skipping 52 matching lines @@
       break;
     case LAUNCH_LAST_APP:
       HandleLaunchLastApp();
       break;
     case MAGNIFY_SCREEN_ZOOM_IN:
       HandleMagnifyScreen(1);
       break;
     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;
     case ROTATE_WINDOW:
       HandleRotateActiveWindow();
       break;
     case SCALE_UI_DOWN:
       accelerators::ZoomInternalDisplay(false /* down */);
       break;
     case SCALE_UI_RESET:
       accelerators::ResetInternalDisplayZoom();
       break;
     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;
     case TAKE_SCREENSHOT:
       HandleTakeScreenshot(screenshot_delegate_.get());
       break;
     case TAKE_WINDOW_SCREENSHOT:
       HandleTakeWindowScreenshot(screenshot_delegate_.get());
       break;
     case TOGGLE_APP_LIST:
@@ skipping 11 matching lines @@
           !Shell::GetInstance()->display_manager()->unified_desktop_enabled());
       break;
     case DISABLE_GPU_WATCHDOG:
       Shell::GetInstance()->gpu_support()->DisableGpuWatchdog();
       break;
     case LOCK_PRESSED:
     case LOCK_RELEASED:
       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()) {
         // There is no powerd, the Chrome OS power manager, in linux desktop,
         // so call the PowerButtonController here.
         Shell::GetInstance()->power_button_controller()->OnPowerButtonEvent(
             action == POWER_PRESSED, base::TimeTicks());
       }
       // We don't do anything with these at present on the device,
       // (power button events are reported to us from powerm via
@@ skipping 37 matching lines @@
           message_center::NotifierId(
               message_center::NotifierId::SYSTEM_COMPONENT,
               system_notifier::kNotifierDeprecatedAccelerator),
           message_center::RichNotificationData(),
           new DeprecatedAcceleratorNotificationDelegate));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash