Index: ash/shelf/shelf_layout_manager.h |
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h |
index 13f90b6ccce4ad03ddcdb869c5c7f869a958fb9a..0001e2bc9f2c3cfbd5060e47f0a3cd067d17b848 100644 |
--- a/ash/shelf/shelf_layout_manager.h |
+++ b/ash/shelf/shelf_layout_manager.h |
@@ -122,6 +122,9 @@ class ASH_EXPORT ShelfLayoutManager : |
// Returns the ideal bounds of the shelf assuming it is visible. |
gfx::Rect GetIdealBounds(); |
+ // Returns the docked area bounds. |
+ const gfx::Rect& dock_bounds() { return dock_bounds_; } |
oshima
2013/12/05 22:51:01
const (method)
btw, isn't work area bounds enough
varkha
2013/12/05 23:42:05
Done. I am not sure we can rely on work address bo
oshima
2013/12/06 00:10:21
I don't think virtual keyboard should have impact
varkha
2013/12/06 00:20:12
It currently does (although the changes due to VK
|
+ |
// Stops any animations and sets the bounds of the launcher and status |
// widgets. |
void LayoutShelf(); |
@@ -292,7 +295,7 @@ class ASH_EXPORT ShelfLayoutManager : |
void UpdateTargetBoundsForGesture(TargetBounds* target_bounds) const; |
// Updates the background of the shelf. |
- void UpdateShelfBackground(BackgroundAnimator::ChangeType type); |
+ void UpdateShelfBackground(BackgroundAnimatorChangeType type); |
// Returns how the shelf background is painted. |
ShelfBackgroundType GetShelfBackgroundType() const; |
@@ -331,7 +334,7 @@ class ASH_EXPORT ShelfLayoutManager : |
virtual void OnKeyboardBoundsChanging( |
const gfx::Rect& keyboard_bounds) OVERRIDE; |
- // Overridden from dock::DockObserver: |
+ // Overridden from DockedWindowLayoutManagerObserver: |
virtual void OnDockBoundsChanging( |
const gfx::Rect& dock_bounds, |
DockedWindowLayoutManagerObserver::Reason reason) OVERRIDE; |