Remove docked windows entirely in M59.

ash/common/accelerators/accelerator_controller.cc

 // Copyright (c) 2012 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/common/accelerators/accelerator_controller.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_commands.h"
 #include "ash/common/accelerators/accelerator_controller_delegate.h"
@@ skipping 384 matching lines @@
   if (accelerator.key_code() == ui::VKEY_MEDIA_LAUNCH_APP2)
     base::RecordAction(UserMetricsAction("Accel_Fullscreen_F4"));
   accelerators::ToggleFullscreen();
 }
 
 void HandleToggleOverview() {
   base::RecordAction(base::UserMetricsAction("Accel_Overview_F5"));
   WmShell::Get()->window_selector_controller()->ToggleOverview();
 }
 
-bool CanHandleWindowSnapOrDock() {
+bool CanHandleWindowSnap() {
   WmWindow* active_window = WmShell::Get()->GetActiveWindow();
   if (!active_window)
     return false;
   wm::WindowState* window_state = active_window->GetWindowState();
   // Disable window snapping shortcut key for full screen window due to
   // http://crbug.com/135487.
   return (window_state && window_state->IsUserPositionable() &&
           !window_state->IsFullscreen());
 }
 
-void HandleWindowSnapOrDock(AcceleratorAction action) {
-  if (action == WINDOW_CYCLE_SNAP_DOCK_LEFT)
+void HandleWindowSnap(AcceleratorAction action) {
+  if (action == WINDOW_CYCLE_SNAP_LEFT)
     base::RecordAction(UserMetricsAction("Accel_Window_Snap_Left"));
   else
     base::RecordAction(UserMetricsAction("Accel_Window_Snap_Right"));
 
-  const wm::WMEvent event(action == WINDOW_CYCLE_SNAP_DOCK_LEFT
-                              ? wm::WM_EVENT_CYCLE_SNAP_DOCK_LEFT
-                              : wm::WM_EVENT_CYCLE_SNAP_DOCK_RIGHT);
+  const wm::WMEvent event(action == WINDOW_CYCLE_SNAP_LEFT
+                              ? wm::WM_EVENT_CYCLE_SNAP_LEFT
+                              : wm::WM_EVENT_CYCLE_SNAP_RIGHT);
   WmWindow* active_window = WmShell::Get()->GetActiveWindow();
   DCHECK(active_window);
   active_window->GetWindowState()->OnWMEvent(&event);
 }
 
 void HandleWindowMinimize() {
   base::RecordAction(base::UserMetricsAction("Accel_Toggle_Minimized_Minus"));
   accelerators::ToggleMinimized();
 }
 
 bool CanHandlePositionCenter() {
-  // Docked windows do not support centering.
-  WmWindow* active_window = WmShell::Get()->GetActiveWindow();
-  return (active_window && !active_window->GetWindowState()->IsDocked());
+  return WmShell::Get()->GetActiveWindow() != nullptr;
 }
 
 void HandlePositionCenter() {
   base::RecordAction(UserMetricsAction("Accel_Window_Position_Center"));
   wm::CenterWindow(WmShell::Get()->GetActiveWindow());
 }
 
 void HandleShowImeMenuBubble() {
   base::RecordAction(UserMetricsAction("Accel_Show_Ime_Menu_Bubble"));
 
@@ skipping 460 matching lines @@
       return CanHandleShowStylusTools();
     case SWITCH_IME:
       return CanHandleSwitchIme(ime_control_delegate_.get(), accelerator);
     case SWITCH_TO_PREVIOUS_USER:
     case SWITCH_TO_NEXT_USER:
       return CanHandleCycleUser();
     case TOGGLE_APP_LIST:
       return CanHandleToggleAppList(accelerator, previous_accelerator);
     case TOGGLE_CAPS_LOCK:
       return CanHandleToggleCapsLock(accelerator, previous_accelerator);
-    case WINDOW_CYCLE_SNAP_DOCK_LEFT:
-    case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
-      return CanHandleWindowSnapOrDock();
+    case WINDOW_CYCLE_SNAP_LEFT:
+    case WINDOW_CYCLE_SNAP_RIGHT:
+      return CanHandleWindowSnap();
     case WINDOW_POSITION_CENTER:
       return CanHandlePositionCenter();
 
     // The following are always enabled.
     case BRIGHTNESS_DOWN:
     case BRIGHTNESS_UP:
     case EXIT:
     case FOCUS_NEXT_PANE:
     case FOCUS_PREVIOUS_PANE:
     case FOCUS_SHELF:
@@ skipping 249 matching lines @@
       break;
     case VOLUME_DOWN:
       HandleVolumeDown(volume_controller_.get(), accelerator);
       break;
     case VOLUME_MUTE:
       HandleVolumeMute(volume_controller_.get(), accelerator);
       break;
     case VOLUME_UP:
       HandleVolumeUp(volume_controller_.get(), accelerator);
       break;
-    case WINDOW_CYCLE_SNAP_DOCK_LEFT:
-    case WINDOW_CYCLE_SNAP_DOCK_RIGHT:
-      HandleWindowSnapOrDock(action);
+    case WINDOW_CYCLE_SNAP_LEFT:
+    case WINDOW_CYCLE_SNAP_RIGHT:
+      HandleWindowSnap(action);
       break;
     case WINDOW_MINIMIZE:
       HandleWindowMinimize();
       break;
     case WINDOW_POSITION_CENTER:
       HandlePositionCenter();
       break;
     default:
       // Temporary until mash transition complete. Needed as some actions
       // don't yet work with mash.
@@ skipping 83 matching lines @@
       data->uma_histogram_name, data->notification_message_id,
       data->old_shortcut_id, data->new_shortcut_id);
 
   if (!data->deprecated_enabled)
     return AcceleratorProcessingStatus::STOP;
 
   return AcceleratorProcessingStatus::PROCEED;
 }
 
 }  // namespace ash