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

Unified Diff: ash/launcher/launcher_view.cc

Issue 22493014: Change from DCHECK to conditional to prevent false alarm on shelf alignment changed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 2bc06d51b3f335fe7d9c947d8c376694acde4411..676c5d57d34400f7085930f77c8a3cc8e91140a5 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -782,10 +782,9 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
last_hidden_index_ >= first_panel_index);
// Create Space for the overflow button
- if (show_overflow && ash::switches::UseAlternateShelfLayout()) {
- DCHECK(last_visible_index_ > 0);
+ if (show_overflow && ash::switches::UseAlternateShelfLayout() &&
+ last_visible_index_ > 0)
--last_visible_index_;
- }
for (int i = 0; i < view_model_->view_size(); ++i) {
bool visible = i <= last_visible_index_ || i > last_hidden_index_;
// Always show the app list.
« 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