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

Unified Diff: ash/launcher/launcher_view.h

Issue 10068027: ash: Fix launcher icon overlaps with status. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use last_visible_index_ part from 9808026 and add tests Created 8 years, 8 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
Index: ash/launcher/launcher_view.h
diff --git a/ash/launcher/launcher_view.h b/ash/launcher/launcher_view.h
index dc1d8d1b01985d6a5cb5a5d0253db079c2b03d07..1af29c4b35f4edfe6fb8d703391df3acedd1fe42 100644
--- a/ash/launcher/launcher_view.h
+++ b/ash/launcher/launcher_view.h
@@ -46,11 +46,25 @@ class ASH_EXPORT LauncherView : public views::View,
explicit TestAPI(LauncherView* launcher_view)
: launcher_view_(launcher_view) {
}
+
// Number of icons displayed.
int GetButtonCount();
+
// Retrieve the button at |index|.
LauncherButton* GetButton(int index);
+ // Last visible button index.
+ int GetLastVisibleIndex();
+
+ // Returns true if overflow button is visible.
+ bool IsOverflowButtonVisible();
+
+ // Sets animation duration in milliseconds for test.
+ void SetAnimationDuration(int duration_ms);
+
+ // Runs message loop and waits until all add/remove animations are done.
+ void RunMessageLoopUntilAnimationsDone();
+
private:
LauncherView* launcher_view_;
@@ -169,6 +183,9 @@ class ASH_EXPORT LauncherView : public views::View,
// item in |model_|.
scoped_ptr<views::ViewModel> view_model_;
+ // Index of the last visible launcher button (does not go into overflow).
+ int last_visible_index_;
+
scoped_ptr<views::BoundsAnimator> bounds_animator_;
views::ImageButton* overflow_button_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/launcher/launcher_view.cc » ('j') | ash/launcher/launcher_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698