| Index: ash/system/cast/tray_cast.cc
|
| diff --git a/ash/system/cast/tray_cast.cc b/ash/system/cast/tray_cast.cc
|
| index fbbc8b5152a910239d80d3a2f13ca42a0d3a2d7f..102c864c245730fc8d6dd76a37ea65c778e9b1b5 100644
|
| --- a/ash/system/cast/tray_cast.cc
|
| +++ b/ash/system/cast/tray_cast.cc
|
| @@ -338,7 +338,7 @@ class CastTrayView : public TrayItemView {
|
|
|
| // Called when the tray alignment changes so that the icon can recenter
|
| // itself.
|
| - void UpdateAlignment(ShelfAlignment alignment);
|
| + void UpdateAlignment(wm::ShelfAlignment alignment);
|
|
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(CastTrayView);
|
| @@ -356,7 +356,7 @@ CastTrayView::CastTrayView(SystemTrayItem* tray_item)
|
| CastTrayView::~CastTrayView() {
|
| }
|
|
|
| -void CastTrayView::UpdateAlignment(ShelfAlignment alignment) {
|
| +void CastTrayView::UpdateAlignment(wm::ShelfAlignment alignment) {
|
| // Center the item dependent on the orientation of the shelf.
|
| views::BoxLayout::Orientation layout = IsHorizontalAlignment(alignment)
|
| ? views::BoxLayout::kVertical
|
| @@ -673,7 +673,7 @@ void TrayCast::OnCastingSessionStartedOrStopped(bool started) {
|
| UpdatePrimaryView();
|
| }
|
|
|
| -void TrayCast::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| +void TrayCast::UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) {
|
| if (tray_)
|
| tray_->UpdateAlignment(alignment);
|
| }
|
|
|