Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/system/user/tray_user.h

 // 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.
 
 #ifndef ASH_SYSTEM_USER_TRAY_USER_H_
 #define ASH_SYSTEM_USER_TRAY_USER_H_
 
 #include "ash/ash_export.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 51 matching lines @@
   // Use for access inside of tests.
   tray::UserView* user_view_for_test() const { return user_; }
 
  private:
   // Overridden from SystemTrayItem.
   views::View* CreateTrayView(user::LoginStatus status) override;
   views::View* CreateDefaultView(user::LoginStatus status) override;
   void DestroyTrayView() override;
   void DestroyDefaultView() override;
   void UpdateAfterLoginStatusChange(user::LoginStatus status) override;
-  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
+  void UpdateAfterShelfAlignmentChange(wm::ShelfAlignment alignment) override;
 
   // Overridden from UserObserver.
   void OnUserUpdate() override;
   void OnUserAddedToSession() override;
 
   void UpdateAvatarImage(user::LoginStatus status);
 
   // Updates the layout of this item.
   void UpdateLayoutOfItem();
 
   // The user index to use.
   UserIndex user_index_;
 
   tray::UserView* user_;
 
   // View that contains label and/or avatar.
   views::View* layout_view_;
   tray::RoundedImageView* avatar_;
   views::Label* label_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayUser);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_USER_TRAY_USER_H_