Refactors WindowResizers to use ash/wm/common

ash/wm/panels/panel_layout_manager.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/wm/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 #include <utility>
 
-#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_types.h"
-#include "ash/shelf/shelf_util.h"
-#include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
-#include "ash/shell_window_ids.h"
-#include "ash/wm/aura/wm_window_aura.h"
+#include "ash/wm/common/shelf/wm_shelf.h"
+#include "ash/wm/common/shelf/wm_shelf_util.h"
 #include "ash/wm/common/window_animation_types.h"
 #include "ash/wm/common/window_parenting_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_globals.h"
 #include "ash/wm/common/wm_root_window_controller.h"
+#include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
 #include "ash/wm/common/wm_window_property.h"
-#include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm/window_animations.h"
 #include "base/auto_reset.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
-#include "ui/aura/window.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/views/background.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
@@ skipping 140 matching lines @@
 }  // namespace
 
 class PanelCalloutWidget : public views::Widget {
  public:
   explicit PanelCalloutWidget(wm::WmWindow* container) : background_(nullptr) {
     InitWidget(container);
   }
 
   void SetAlignment(wm::ShelfAlignment alignment) {
     gfx::Rect callout_bounds = GetWindowBoundsInScreen();
-    if (IsHorizontalAlignment(alignment)) {
+    if (wm::IsHorizontalAlignment(alignment)) {
       callout_bounds.set_width(kArrowWidth);
       callout_bounds.set_height(kArrowHeight);
     } else {
       callout_bounds.set_width(kArrowHeight);
       callout_bounds.set_height(kArrowWidth);
     }
     SetBounds(callout_bounds);
     if (background_->alignment() != alignment) {
       background_->set_alignment(alignment);
       SchedulePaintInRect(gfx::Rect(callout_bounds.size()));
@@ skipping 36 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager public implementation:
 PanelLayoutManager::PanelLayoutManager(wm::WmWindow* panel_container)
     : panel_container_(panel_container),
       root_window_controller_(panel_container->GetRootWindowController()),
       in_add_window_(false),
       in_layout_(false),
       show_callout_widgets_(true),
       dragged_panel_(NULL),
-      shelf_(NULL),
-      shelf_layout_manager_(NULL),
+      shelf_(nullptr),
       last_active_panel_(NULL),
       weak_factory_(this) {
   DCHECK(panel_container);
   wm::WmGlobals* globals = panel_container->GetGlobals();
   globals->AddActivationObserver(this);
   globals->AddDisplayObserver(this);
   globals->AddOverviewModeObserver(this);
   root_window_controller_->AddObserver(this);
 }
 
 PanelLayoutManager::~PanelLayoutManager() {
   Shutdown();
 }
 
 // static
 PanelLayoutManager* PanelLayoutManager::Get(wm::WmWindow* window) {
   if (!window)
     return nullptr;
 
   return static_cast<PanelLayoutManager*>(
       window->GetRootWindow()
           ->GetChildByShellWindowId(kShellWindowId_PanelContainer)
           ->GetLayoutManager());
 }
 
 void PanelLayoutManager::Shutdown() {
-  if (shelf_layout_manager_)
-    shelf_layout_manager_->RemoveObserver(this);
-  shelf_layout_manager_ = NULL;
+  if (shelf_) {
+    shelf_->RemoveObserver(this);
+    shelf_ = nullptr;
+  }
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     delete iter->callout_widget;
   }
   panel_windows_.clear();
-  if (shelf_)
-    shelf_->RemoveIconObserver(this);
-  shelf_ = NULL;
   wm::WmGlobals* globals = panel_container_->GetGlobals();
   globals->RemoveActivationObserver(this);
   globals->RemoveDisplayObserver(this);
   globals->RemoveOverviewModeObserver(this);
   root_window_controller_->RemoveObserver(this);
 }
 
 void PanelLayoutManager::StartDragging(wm::WmWindow* panel) {
   DCHECK(!dragged_panel_);
   dragged_panel_ = panel;
   Relayout();
 }
 
 void PanelLayoutManager::FinishDragging() {
   dragged_panel_ = NULL;
   Relayout();
 }
 
-void PanelLayoutManager::SetShelf(Shelf* shelf) {
+void PanelLayoutManager::SetShelf(wm::WmShelf* shelf) {
   DCHECK(!shelf_);
-  DCHECK(!shelf_layout_manager_);
   shelf_ = shelf;
-  shelf_->AddIconObserver(this);
-  if (shelf_->shelf_layout_manager()) {
-    shelf_layout_manager_ = shelf_->shelf_layout_manager();
-    WillChangeVisibilityState(shelf_layout_manager_->visibility_state());
-    shelf_layout_manager_->AddObserver(this);
-  }
+  shelf_->AddObserver(this);
+  WillChangeVisibilityState(shelf_->GetVisibilityState());
 }
 
 void PanelLayoutManager::ToggleMinimize(wm::WmWindow* panel) {
   DCHECK(panel->GetParent() == panel_container_);
   wm::WindowState* window_state = panel->GetWindowState();
   if (window_state->IsMinimized())
     window_state->Restore();
   else
     window_state->Minimize();
 }
@@ skipping 118 matching lines @@
     const gfx::Size min_size = child->GetMinimumSize();
     bounds.set_width(std::max(min_size.width(), bounds.width()));
     bounds.set_height(std::max(min_size.height(), bounds.height()));
   }
 
   child->SetBoundsDirect(bounds);
   Relayout();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, ShelfIconObserver implementation:
-
-void PanelLayoutManager::OnShelfIconPositionsChanged() {
-  // TODO: As this is called for every animation step now. Relayout needs to be
-  // updated to use current icon position instead of use the ideal bounds so
-  // that the panels slide with their icons instead of jumping.
-  Relayout();
-}
-
-////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager, ash::ShellObserver implementation:
 
 void PanelLayoutManager::OnOverviewModeEnded() {
   Relayout();
 }
 
 void PanelLayoutManager::OnShelfAlignmentChanged() {
   Relayout();
 }
 
@@ skipping 27 matching lines @@
     return;
   }
 
   if (window_state->IsMinimized())
     MinimizePanel(window_state->window());
   else
     RestorePanel(window_state->window());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// PanelLayoutManager, aura::client::ActivationChangeObserver implementation:
+// PanelLayoutManager, wm::WmActivationObserver implementation:
 
 void PanelLayoutManager::OnWindowActivated(wm::WmWindow* gained_active,
                                            wm::WmWindow* lost_active) {
   // Ignore if the panel that is not managed by this was activated.
   if (gained_active && gained_active->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
       gained_active->GetParent() == panel_container_) {
     UpdateStacking(gained_active);
     UpdateCallouts();
   }
 }
@@ skipping 35 matching lines @@
     // Advance the iterator before minimizing it: http://crbug.com/393047.
     ++iter;
     if (window != dragged_panel_ && window->IsVisible()) {
       minimized_windows->Add(window);
       window->GetWindowState()->Minimize();
     }
   }
   restore_windows_on_shelf_visible_ = std::move(minimized_windows);
 }
 
+void PanelLayoutManager::OnShelfIconPositionsChanged() {
+  // TODO: As this is called for every animation step now. Relayout needs to be
+  // updated to use current icon position instead of use the ideal bounds so
+  // that the panels slide with their icons instead of jumping.
+  Relayout();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager private implementation:
 
 void PanelLayoutManager::MinimizePanel(wm::WmWindow* panel) {
   panel->SetVisibilityAnimationType(
       wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
   ui::Layer* layer = panel->GetLayer();
   ui::ScopedLayerAnimationSettings panel_slide_settings(layer->GetAnimator());
   panel_slide_settings.SetPreemptionStrategy(
       ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
   panel_slide_settings.SetTransitionDuration(
       base::TimeDelta::FromMilliseconds(kPanelSlideDurationMilliseconds));
   gfx::Rect bounds(panel->GetBounds());
-  bounds.Offset(GetSlideInAnimationOffset(shelf_->alignment()));
+  bounds.Offset(GetSlideInAnimationOffset(shelf_->GetAlignment()));
   panel->SetBoundsDirect(bounds);
   panel->Hide();
   layer->SetOpacity(0);
   if (panel->IsActive())
     panel->Deactivate();
   Relayout();
 }
 
 void PanelLayoutManager::RestorePanel(wm::WmWindow* panel) {
   PanelList::iterator found =
       std::find(panel_windows_.begin(), panel_windows_.end(), panel);
   DCHECK(found != panel_windows_.end());
   found->slide_in = true;
   Relayout();
 }
 
 void PanelLayoutManager::Relayout() {
-  if (!shelf_ || !shelf_->shelf_widget())
+  if (!shelf_)
     return;
 
   // Suppress layouts during overview mode because changing window bounds
   // interfered with overview mode animations. However, layouts need to be done
   // when the WindowSelectorController is restoring minimized windows so that
   // they actually become visible.
-  WindowSelectorController* window_selector_controller =
-      Shell::GetInstance()->window_selector_controller();
-  if (in_layout_ || !window_selector_controller ||
-      (window_selector_controller->IsSelecting() &&
-          !window_selector_controller->IsRestoringMinimizedWindows()))
+  wm::WmGlobals* globals = panel_container_->GetGlobals();
+  if (in_layout_ || (globals->IsOverviewModeSelecting() &&
+                     !globals->IsOverviewModeRestoringMinimizedWindows())) {
     return;
+  }
 
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
-  const wm::ShelfAlignment alignment = shelf_->alignment();
-  const bool horizontal = shelf_->IsHorizontalAlignment();
+  const wm::ShelfAlignment alignment = shelf_->GetAlignment();
+  const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   gfx::Rect shelf_bounds = panel_container_->ConvertRectFromScreen(
-      shelf_->shelf_widget()->GetWindowBoundsInScreen());
+      shelf_->GetWindow()->GetBoundsInScreen());
   int panel_start_bounds = kPanelIdealSpacing;
   int panel_end_bounds =
       horizontal ? panel_container_->GetBounds().width() - kPanelIdealSpacing
                  : panel_container_->GetBounds().height() - kPanelIdealSpacing;
   wm::WmWindow* active_panel = nullptr;
   std::vector<VisiblePanelPositionInfo> visible_panels;
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     wm::WmWindow* panel = iter->window;
     iter->callout_widget->SetAlignment(alignment);
 
     // Consider the dragged panel as part of the layout as long as it is
     // touching the shelf.
     if ((!panel->IsVisible() && !iter->slide_in) ||
         (panel == dragged_panel_ &&
          !BoundsAdjacent(panel->GetBounds(), shelf_bounds))) {
       continue;
     }
 
     // If the shelf is currently hidden (full-screen mode), minimize panel until
     // full-screen mode is exited. When a panel is dragged from another display
     // the shelf state does not update before the panel is added so we exclude
     // the dragged panel.
     if (panel != dragged_panel_ && restore_windows_on_shelf_visible_) {
       panel->GetWindowState()->Minimize();
       restore_windows_on_shelf_visible_->Add(panel);
       continue;
     }
 
-    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(
-        wm::WmWindowAura::GetAuraWindow(panel));
+    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
 
     // If both the icon width and height are 0 then there is no icon in the
     // shelf. If the shelf is hidden, one of the height or width will be
     // 0 but the position in the shelf and major dimension is still reported
     // correctly and the panel can be aligned above where the hidden icon is.
     if (icon_bounds.width() == 0 && icon_bounds.height() == 0)
       continue;
 
     if (panel->IsFocused() ||
         panel->Contains(panel->GetGlobals()->GetFocusedWindow())) {
@@ skipping 105 matching lines @@
   // We want to to stack the panels like a deck of cards:
   // ,--,--,--,-------.--.--.
   // |  |  |  |       |  |  |
   // |  |  |  |       |  |  |
   //
   // We use the middle of each panel to figure out how to stack the panels. This
   // allows us to update the stacking when a panel is being dragged around by
   // the titlebar--even though it doesn't update the shelf icon positions, we
   // still want the visual effect.
   std::map<int, wm::WmWindow*> window_ordering;
-  const bool horizontal = shelf_->IsHorizontalAlignment();
+  const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   for (PanelList::const_iterator it = panel_windows_.begin();
        it != panel_windows_.end(); ++it) {
     gfx::Rect bounds = it->window->GetBounds();
     window_ordering.insert(std::make_pair(horizontal ?
                                               bounds.x() + bounds.width() / 2 :
                                               bounds.y() + bounds.height() / 2,
                                           it->window));
   }
 
   wm::WmWindow* previous_panel = nullptr;
@@ skipping 14 matching lines @@
     previous_panel = it->second;
   }
 
   panel_container_->StackChildAtTop(active_panel);
   if (dragged_panel_ && dragged_panel_->GetParent() == panel_container_)
     panel_container_->StackChildAtTop(dragged_panel_);
   last_active_panel_ = active_panel;
 }
 
 void PanelLayoutManager::UpdateCallouts() {
-  const bool horizontal = shelf_->IsHorizontalAlignment();
+  const bool horizontal = wm::IsHorizontalAlignment(shelf_->GetAlignment());
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     wm::WmWindow* panel = iter->window;
     views::Widget* callout_widget = iter->callout_widget;
     wm::WmWindow* callout_widget_window = wm::WmWindow::Get(callout_widget);
 
     gfx::Rect current_bounds = panel->GetBoundsInScreen();
     gfx::Rect bounds =
         panel->GetParent()->ConvertRectToScreen(panel->GetTargetBounds());
-    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(
-        wm::WmWindowAura::GetAuraWindow(panel));
+    gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
     if (icon_bounds.IsEmpty() || !panel->GetLayer()->GetTargetVisibility() ||
         panel == dragged_panel_ || !show_callout_widgets_) {
       callout_widget->Hide();
       callout_widget_window->GetLayer()->SetOpacity(0);
       continue;
     }
 
     gfx::Rect callout_bounds = callout_widget->GetWindowBoundsInScreen();
     gfx::Vector2d slide_vector = bounds.origin() - current_bounds.origin();
     int slide_distance = horizontal ? slide_vector.x() : slide_vector.y();
     int distance_until_over_panel = 0;
     if (horizontal) {
       callout_bounds.set_x(
           icon_bounds.x() + (icon_bounds.width() - callout_bounds.width()) / 2);
       distance_until_over_panel = std::max(
           current_bounds.x() - callout_bounds.x(),
           callout_bounds.right() - current_bounds.right());
     } else {
       callout_bounds.set_y(
           icon_bounds.y() + (icon_bounds.height() -
                              callout_bounds.height()) / 2);
       distance_until_over_panel = std::max(
           current_bounds.y() - callout_bounds.y(),
           callout_bounds.bottom() - current_bounds.bottom());
     }
-    if (shelf_->alignment() == wm::SHELF_ALIGNMENT_LEFT)
+    if (shelf_->GetAlignment() == wm::SHELF_ALIGNMENT_LEFT)
       callout_bounds.set_x(bounds.x() - callout_bounds.width());
-    else if (shelf_->alignment() == wm::SHELF_ALIGNMENT_RIGHT)
+    else if (shelf_->GetAlignment() == wm::SHELF_ALIGNMENT_RIGHT)
       callout_bounds.set_x(bounds.right());
     else
       callout_bounds.set_y(bounds.bottom());
     callout_bounds = callout_widget_window->GetParent()->ConvertRectFromScreen(
         callout_bounds);
 
     callout_widget_window->SetBoundsDirect(callout_bounds);
     panel_container_->StackChildAbove(callout_widget_window, panel);
 
     ui::Layer* layer = callout_widget_window->GetLayer();
@@ skipping 58 matching lines @@
       // Keyboard hidden, restore original bounds if they exist.
       panel->SetBoundsDirect(panel_state->GetRestoreBoundsInScreen());
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 }  // namespace ash