| Index: ash/system/tray/tray_item_view.cc
|
| diff --git a/ash/system/tray/tray_item_view.cc b/ash/system/tray/tray_item_view.cc
|
| index 829360f5d1ea29842119bd8c672e0474d5968df6..0897e96a1a8ac4cc7872975e7081516f16c04c65 100644
|
| --- a/ash/system/tray/tray_item_view.cc
|
| +++ b/ash/system/tray/tray_item_view.cc
|
| @@ -8,6 +8,7 @@
|
| #include "ash/shelf/shelf_util.h"
|
| #include "ash/system/tray/system_tray.h"
|
| #include "ash/system/tray/system_tray_item.h"
|
| +#include "ash/wm/common/shelf/wm_shelf_util.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/gfx/animation/slide_animation.h"
|
| #include "ui/views/controls/image_view.h"
|
| @@ -86,13 +87,13 @@ int TrayItemView::GetAnimationDurationMS() {
|
|
|
| gfx::Size TrayItemView::GetPreferredSize() const {
|
| gfx::Size size = DesiredSize();
|
| - if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment()))
|
| + if (wm::IsHorizontalAlignment(owner()->system_tray()->shelf_alignment()))
|
| size.set_height(kTrayIconHeight);
|
| else
|
| size.set_width(kTrayIconWidth);
|
| if (!animation_.get() || !animation_->is_animating())
|
| return size;
|
| - if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
|
| + if (wm::IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
|
| size.set_width(std::max(1,
|
| static_cast<int>(size.width() * animation_->GetCurrentValue())));
|
| } else {
|
| @@ -112,7 +113,7 @@ void TrayItemView::ChildPreferredSizeChanged(views::View* child) {
|
|
|
| void TrayItemView::AnimationProgressed(const gfx::Animation* animation) {
|
| gfx::Transform transform;
|
| - if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
|
| + if (wm::IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
|
| transform.Translate(0, animation->CurrentValueBetween(
|
| static_cast<double>(height()) / 2, 0.));
|
| } else {
|
|
|