Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1659)

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 98373006: Animating docked background in sync with shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Animating docked background in sync with shelf (rebase) Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shelf/background_animator.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e9615a8fcf0b329795671b4e598221e1569f0b01 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() const { return dock_bounds_; }
+
// 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;
« no previous file with comments | « ash/shelf/background_animator.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698