| Index: ash/system/chromeos/network/tray_network.cc
|
| diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
|
| index 5bc9c8f36977debd65ceb2ad686011a9c9fee6a0..eeb86d5adee46faf66c511c5bd16e3bd129ff852 100644
|
| --- a/ash/system/chromeos/network/tray_network.cc
|
| +++ b/ash/system/chromeos/network/tray_network.cc
|
| @@ -91,7 +91,7 @@ class NetworkTrayView : public TrayItemView,
|
| }
|
| }
|
|
|
| - void UpdateAlignment(ShelfAlignment alignment) {
|
| + void UpdateAlignment(wm::ShelfAlignment alignment) {
|
| SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
|
| ? views::BoxLayout::kHorizontal
|
| : views::BoxLayout::kVertical,
|
| @@ -303,7 +303,8 @@ void TrayNetwork::DestroyDetailedView() {
|
| void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
|
| }
|
|
|
| -void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
|
| +void TrayNetwork::UpdateAfterShelfAlignmentChange(
|
| + wm::ShelfAlignment alignment) {
|
| if (tray_) {
|
| SetTrayImageItemBorder(tray_, alignment);
|
| tray_->UpdateAlignment(alignment);
|
|
|