| Index: ash/system/status_area_widget_delegate.h
|
| diff --git a/ash/system/status_area_widget_delegate.h b/ash/system/status_area_widget_delegate.h
|
| index 35228d4ab8f3e21f511170e02dd5e63d35b188fb..d622cf209c762d744c8e03f31a4dd72623cc2ffc 100644
|
| --- a/ash/system/status_area_widget_delegate.h
|
| +++ b/ash/system/status_area_widget_delegate.h
|
| @@ -7,9 +7,9 @@
|
| #pragma once
|
|
|
| #include "ash/ash_export.h"
|
| +#include "ash/wm/shelf_auto_hide_behavior.h"
|
| #include "ui/gfx/image/image_skia.h"
|
| #include "ui/views/accessible_pane_view.h"
|
| -#include "ui/views/layout/box_layout.h"
|
| #include "ui/views/widget/widget_delegate.h"
|
|
|
| namespace ash {
|
| @@ -17,8 +17,8 @@ namespace internal {
|
|
|
| class FocusCycler;
|
|
|
| -class ASH_EXPORT StatusAreaWidgetDelegate : public views::WidgetDelegate,
|
| - public views::AccessiblePaneView {
|
| +class ASH_EXPORT StatusAreaWidgetDelegate : public views::AccessiblePaneView,
|
| + public views::WidgetDelegate {
|
| public:
|
| StatusAreaWidgetDelegate();
|
| virtual ~StatusAreaWidgetDelegate();
|
| @@ -38,10 +38,18 @@ class ASH_EXPORT StatusAreaWidgetDelegate : public views::WidgetDelegate,
|
| virtual bool CanActivate() const OVERRIDE;
|
| virtual void DeleteDelegate() OVERRIDE;
|
|
|
| - void SetLayout(views::BoxLayout::Orientation orientation);
|
| + void AddTray(views::View* tray);
|
| + void UpdateLayout();
|
| +
|
| + void set_alignment(ShelfAlignment alignment) { alignment_ = alignment; }
|
| +
|
| + protected:
|
| + // Overridden from views::View:
|
| + virtual void ChildPreferredSizeChanged(View* child);
|
|
|
| private:
|
| const FocusCycler* focus_cycler_for_testing_;
|
| + ShelfAlignment alignment_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(StatusAreaWidgetDelegate);
|
| };
|
|
|