Index: ash/system/tray/tray_background_view.h |
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h |
index df447a5fb38370cd156919e65b88573bfc696ed6..dc628a7ea77d1e4cbc750e4308dd7ee650f75822 100644 |
--- a/ash/system/tray/tray_background_view.h |
+++ b/ash/system/tray/tray_background_view.h |
@@ -36,10 +36,10 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
// auto-resizes the widget when necessary. |
class TrayContainer : public views::View { |
public: |
- explicit TrayContainer(ShelfAlignment alignment); |
+ explicit TrayContainer(wm::ShelfAlignment alignment); |
~TrayContainer() override {} |
- void SetAlignment(ShelfAlignment alignment); |
+ void SetAlignment(wm::ShelfAlignment alignment); |
void set_size(const gfx::Size& size) { size_ = size; } |
@@ -56,7 +56,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
private: |
void UpdateLayout(); |
- ShelfAlignment alignment_; |
+ wm::ShelfAlignment alignment_; |
gfx::Size size_; |
DISALLOW_COPY_AND_ASSIGN(TrayContainer); |
@@ -86,7 +86,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
void UpdateBackground(int alpha) override; |
// Called whenever the shelf alignment changes. |
- virtual void SetShelfAlignment(ShelfAlignment alignment); |
+ virtual void SetShelfAlignment(wm::ShelfAlignment alignment); |
// Called when the anchor (tray or bubble) may have moved or changed. |
virtual void AnchorUpdated() {} |
@@ -144,7 +144,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
return status_area_widget_; |
} |
TrayContainer* tray_container() const { return tray_container_; } |
- ShelfAlignment shelf_alignment() const { return shelf_alignment_; } |
+ wm::ShelfAlignment shelf_alignment() const { return shelf_alignment_; } |
TrayEventFilter* tray_event_filter() { return tray_event_filter_.get(); } |
ShelfLayoutManager* GetShelfLayoutManager(); |
@@ -174,7 +174,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView, |
TrayContainer* tray_container_; |
// Shelf alignment. |
- ShelfAlignment shelf_alignment_; |
+ wm::ShelfAlignment shelf_alignment_; |
// Owned by the view passed to SetContents(). |
TrayBackground* background_; |