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

Unified Diff: ash/shelf/shelf_view.cc

Issue 68263024: [ash] Preferred size of ShelfView is not fixed when item is animating (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index d13f70cc7d534425930baa10233763fc4c98cb0b..61f61d93609fcf123506a951c5c39af0e4a5e33b 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1381,7 +1381,7 @@ gfx::Size ShelfView::GetPreferredSize() {
const gfx::Rect last_button_bounds =
last_button_index >= first_visible_index_ ?
- view_model_->view_at(last_button_index)->bounds() :
+ view_model_->ideal_bounds(last_button_index) :
gfx::Rect(gfx::Size(preferred_size, preferred_size));
if (layout_manager_->IsHorizontalAlignment()) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698