Hide docked windows behind a flag

ash/common/wm/default_state.cc

 // Copyright 2014 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/wm/default_state.h"
 
+#include "ash/common/ash_switches.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_root_window_controller.h"
@@ skipping 81 matching lines @@
     docked_window_layout_manager_->set_event_source(
         DOCKED_ACTION_SOURCE_UNKNOWN);
   }
 
  private:
   DockedWindowLayoutManager* docked_window_layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedDockedLayoutEventSourceResetter);
 };
 
+void CycleSnap(WindowState* window_state, WMEventType event) {
+  DCHECK(!ash::switches::DockedWindowsEnabled());
+
+  wm::WindowStateType desired_snap_state =
+      event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT
+          ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED
+          : wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED;
+
+  if (window_state->CanSnap() &&
+      window_state->GetStateType() != desired_snap_state &&
+      window_state->window()->GetType() != ui::wm::WINDOW_TYPE_PANEL) {
+    const wm::WMEvent event(desired_snap_state ==
+                                    wm::WINDOW_STATE_TYPE_LEFT_SNAPPED
+                                ? wm::WM_EVENT_SNAP_LEFT
+                                : wm::WM_EVENT_SNAP_RIGHT);
+    window_state->OnWMEvent(&event);
+    return;
+  }
+
+  if (window_state->IsSnapped()) {
+    window_state->Restore();
+    return;
+  }
+  window_state->window()->Animate(::wm::WINDOW_ANIMATION_TYPE_BOUNCE);
+}
+
 void CycleSnapDock(WindowState* window_state, WMEventType event) {
+  DCHECK(ash::switches::DockedWindowsEnabled());
+
   DockedWindowLayoutManager* dock_layout =
       GetDockedWindowLayoutManager(window_state->window()->GetShell());
   wm::WindowStateType desired_snap_state =
       event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT
           ? wm::WINDOW_STATE_TYPE_LEFT_SNAPPED
           : wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED;
   DockedAlignment desired_dock_alignment =
       event == WM_EVENT_CYCLE_SNAP_DOCK_LEFT ? DOCKED_ALIGNMENT_LEFT
                                              : DOCKED_ALIGNMENT_RIGHT;
   DockedAlignment current_dock_alignment =
@@ skipping 253 matching lines @@
         window_state->SetRestoreBoundsInParent(restore_bounds);
         window->SetBounds(new_bounds);
       }
       return true;
     }
     case WM_EVENT_TOGGLE_FULLSCREEN:
       ToggleFullScreen(window_state, window_state->delegate());
       return true;
     case WM_EVENT_CYCLE_SNAP_DOCK_LEFT:
     case WM_EVENT_CYCLE_SNAP_DOCK_RIGHT:
-      CycleSnapDock(window_state, event->type());
+      if (ash::switches::DockedWindowsEnabled())
+        CycleSnapDock(window_state, event->type());
+      else
+        CycleSnap(window_state, event->type());
       return true;
     case WM_EVENT_CENTER:
       CenterWindow(window_state);
       return true;
     case WM_EVENT_NORMAL:
     case WM_EVENT_MAXIMIZE:
     case WM_EVENT_MINIMIZE:
     case WM_EVENT_FULLSCREEN:
     case WM_EVENT_PIN:
     case WM_EVENT_TRUSTED_PIN:
@@ skipping 257 matching lines @@
   gfx::Rect bounds_in_parent;
   switch (state_type_) {
     case WINDOW_STATE_TYPE_LEFT_SNAPPED:
     case WINDOW_STATE_TYPE_RIGHT_SNAPPED:
       bounds_in_parent =
           state_type_ == WINDOW_STATE_TYPE_LEFT_SNAPPED
               ? GetDefaultLeftSnappedWindowBoundsInParent(window)
               : GetDefaultRightSnappedWindowBoundsInParent(window);
       break;
     case WINDOW_STATE_TYPE_DOCKED: {
+      // TODO(afakhry): Remove in M58.
+      DCHECK(ash::switches::DockedWindowsEnabled());
       if (window->GetParent()->GetShellWindowId() !=
           kShellWindowId_DockedContainer) {
         WmWindow* docked_container =
             window->GetRootWindow()->GetChildByShellWindowId(
                 kShellWindowId_DockedContainer);
         ReparentChildWithTransientChildren(window, window->GetParent(),
                                            docked_container);
       }
       // Return early because we don't want to update the bounds of the
       // window below; as the bounds are managed by the dock layout.
@@ skipping 104 matching lines @@
     gfx::Rect center_in_parent = GetDisplayWorkAreaBoundsInParent(window);
     center_in_parent.ClampToCenteredSize(window->GetBounds().size());
     window_state->SetBoundsDirectAnimated(center_in_parent);
   }
   // Centering window is treated as if a user moved and resized the window.
   window_state->set_bounds_changed_by_user(true);
 }
 
 }  // namespace wm
 }  // namespace ash