| Index: ash/wm/panels/panel_layout_manager.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc
|
| index e0b56dcd31924b8cff52738f6e1a2a1cc19dd7de..0bc12339a6ef6fe8c548c563835383116cd6629e 100644
|
| --- a/ash/wm/panels/panel_layout_manager.cc
|
| +++ b/ash/wm/panels/panel_layout_manager.cc
|
| @@ -12,7 +12,7 @@
|
| #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"
|
| @@ -188,7 +188,7 @@ class PanelCalloutWidget : public views::Widget {
|
| }
|
|
|
| // Updates the bounds based on the shelf alignment.
|
| - void UpdateBounds(WmShelf* shelf) {
|
| + void UpdateBounds(Shelf* shelf) {
|
| WmWindow* window = WmWindow::Get(this->GetNativeWindow());
|
| gfx::Rect callout_bounds = window->GetBounds();
|
| if (shelf->IsHorizontalAlignment()) {
|
| @@ -305,7 +305,7 @@ void PanelLayoutManager::FinishDragging() {
|
| Relayout();
|
| }
|
|
|
| -void PanelLayoutManager::SetShelf(WmShelf* shelf) {
|
| +void PanelLayoutManager::SetShelf(Shelf* shelf) {
|
| DCHECK(!shelf_);
|
| shelf_ = shelf;
|
| shelf_->AddObserver(this);
|
| @@ -587,7 +587,7 @@ void PanelLayoutManager::MinimizePanel(aura::Window* panel) {
|
| 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);
|
| @@ -862,9 +862,9 @@ void PanelLayoutManager::UpdateCallouts() {
|
| 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());
|
|
|