| Index: ash/wm/status_area_layout_manager.h
|
| diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
|
| index 9f255ced4ff3a1799bd348a0f9f11926966e1844..73e81e6be747fe13f11c5fc084f1c8dffa833f34 100644
|
| --- a/ash/wm/status_area_layout_manager.h
|
| +++ b/ash/wm/status_area_layout_manager.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
|
| #define ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
|
|
|
| +#include "ash/snap_to_pixel_layout_manager.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| #include "ui/aura/layout_manager.h"
|
| @@ -15,18 +16,13 @@ class ShelfWidget;
|
| // StatusAreaLayoutManager is a layout manager responsible for the status area.
|
| // In any case when status area needs relayout it redirects this call to
|
| // ShelfLayoutManager.
|
| -class StatusAreaLayoutManager : public aura::LayoutManager {
|
| +class StatusAreaLayoutManager : public SnapToPixelLayoutManager {
|
| public:
|
| - explicit StatusAreaLayoutManager(ShelfWidget* shelf);
|
| + StatusAreaLayoutManager(aura::Window* container, ShelfWidget* shelf);
|
| virtual ~StatusAreaLayoutManager();
|
|
|
| // Overridden from aura::LayoutManager:
|
| virtual void OnWindowResized() OVERRIDE;
|
| - virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE;
|
| - virtual void OnWillRemoveWindowFromLayout(aura::Window* child) OVERRIDE;
|
| - virtual void OnWindowRemovedFromLayout(aura::Window* child) OVERRIDE;
|
| - virtual void OnChildWindowVisibilityChanged(aura::Window* child,
|
| - bool visible) OVERRIDE;
|
| virtual void SetChildBounds(aura::Window* child,
|
| const gfx::Rect& requested_bounds) OVERRIDE;
|
|
|
|
|