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

Unified Diff: ash/wm/shelf_layout_manager.h

Issue 10911172: Changes launcher so that when animating hidden the background doesn't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 8 years, 3 months 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/wm/custom_frame_view_ash.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/shelf_layout_manager.h
diff --git a/ash/wm/shelf_layout_manager.h b/ash/wm/shelf_layout_manager.h
index 0bd7c75cebf5d3b14189b296c0fe8c7d0e3992b7..d8a38bcb83040272fa4a1b08a55793b4defeade1 100644
--- a/ash/wm/shelf_layout_manager.h
+++ b/ash/wm/shelf_layout_manager.h
@@ -173,6 +173,7 @@ class ASH_EXPORT ShelfLayoutManager :
private:
class AutoHideEventFilter;
+ class UpdateShelfObserver;
friend class ash::ScreenAsh;
friend class ShelfLayoutManagerTest;
FRIEND_TEST_ALL_PREFIXES(ShelfLayoutManagerTest, SetAutoHideBehavior);
@@ -306,6 +307,9 @@ class ASH_EXPORT ShelfLayoutManager :
// Manage the auto-hide state during the gesture.
AutoHideState gesture_drag_auto_hide_state_;
+ // Used to delay updating shelf background.
+ UpdateShelfObserver* update_shelf_observer_;
+
DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
};
« no previous file with comments | « ash/wm/custom_frame_view_ash.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698