chromeos: Rename ash::WmShelf to Shelf

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/keyboard/keyboard_observer_register.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/root_window_controller.h"
-#include "ash/shelf/wm_shelf.h"
+#include "ash/shelf/shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_animation_types.h"
 #include "ash/wm/window_parenting_utils.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/auto_reset.h"
@@ skipping 156 matching lines @@
 
 }  // namespace
 
 class PanelCalloutWidget : public views::Widget {
  public:
   explicit PanelCalloutWidget(Window* container) : background_(nullptr) {
     InitWidget(container);
   }
 
   // Updates the bounds based on the shelf alignment.
-  void UpdateBounds(WmShelf* shelf) {
+  void UpdateBounds(Shelf* shelf) {
     Window* window = this->GetNativeWindow();
     gfx::Rect callout_bounds = window->bounds();
     if (shelf->IsHorizontalAlignment()) {
       callout_bounds.set_width(kArrowWidth);
       callout_bounds.set_height(kArrowHeight);
     } else {
       callout_bounds.set_width(kArrowHeight);
       callout_bounds.set_height(kArrowWidth);
     }
     Window* parent = window->parent();
@@ skipping 95 matching lines @@
   DCHECK(!dragged_panel_);
   dragged_panel_ = panel;
   Relayout();
 }
 
 void PanelLayoutManager::FinishDragging() {
   dragged_panel_ = nullptr;
   Relayout();
 }
 
-void PanelLayoutManager::SetShelf(WmShelf* shelf) {
+void PanelLayoutManager::SetShelf(Shelf* shelf) {
   DCHECK(!shelf_);
   shelf_ = shelf;
   shelf_->AddObserver(this);
   WillChangeVisibilityState(shelf_->GetVisibilityState());
 }
 
 void PanelLayoutManager::ToggleMinimize(Window* panel) {
   DCHECK(panel->parent() == panel_container_);
   wm::WindowState* window_state = wm::GetWindowState(panel);
   if (window_state->IsMinimized())
@@ skipping 258 matching lines @@
 
   ::wm::SetWindowVisibilityAnimationType(
       panel, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
   ui::Layer* layer = panel->layer();
   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->bounds());
-  bounds.Offset(GetSlideInAnimationOffset(shelf_->GetAlignment()));
+  bounds.Offset(GetSlideInAnimationOffset(shelf_->alignment()));
   SetChildBoundsDirect(panel, bounds);
   panel->Hide();
   layer->SetOpacity(0);
   if (::wm::IsActiveWindow(panel))
     ::wm::DeactivateWindow(panel);
   Relayout();
 }
 
 void PanelLayoutManager::RestorePanel(Window* panel) {
   PanelList::iterator found =
@@ skipping 253 matching lines @@
           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_->GetAlignment() == SHELF_ALIGNMENT_LEFT)
+    if (shelf_->alignment() == SHELF_ALIGNMENT_LEFT)
       callout_bounds.set_x(bounds.x() - callout_bounds.width());
-    else if (shelf_->GetAlignment() == SHELF_ALIGNMENT_RIGHT)
+    else if (shelf_->alignment() == SHELF_ALIGNMENT_RIGHT)
       callout_bounds.set_x(bounds.right());
     else
       callout_bounds.set_y(bounds.bottom());
     ::wm::ConvertRectFromScreen(callout_widget_window->parent(),
                                 &callout_bounds);
 
     SetChildBoundsDirect(callout_widget_window, callout_bounds);
     DCHECK_EQ(panel_container_, callout_widget_window->parent());
     DCHECK_EQ(panel_container_, panel->parent());
     panel_container_->StackChildAbove(callout_widget_window, panel);
@@ skipping 63 matching lines @@
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 void PanelLayoutManager::OnKeyboardClosed() {
   keyboard_observer_.RemoveAll();
 }
 
 }  // namespace ash