Commit e8bafd67 authored by harrym@chromium.org's avatar harrym@chromium.org

Change from DCHECK to conditional to prevent false alarm on shelf alignment changed.

BUG=
TBR=jamescook@chromium.org

Review URL: https://chromiumcodereview.appspot.com/22493014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216858 0039d316-1c4b-4281-b951-d872f2087c98
parent ea2dffc9
...@@ -782,10 +782,9 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) { ...@@ -782,10 +782,9 @@ void LauncherView::CalculateIdealBounds(IdealBounds* bounds) {
last_hidden_index_ >= first_panel_index); last_hidden_index_ >= first_panel_index);
// Create Space for the overflow button // Create Space for the overflow button
if (show_overflow && ash::switches::UseAlternateShelfLayout()) { if (show_overflow && ash::switches::UseAlternateShelfLayout() &&
DCHECK(last_visible_index_ > 0); last_visible_index_ > 0)
--last_visible_index_; --last_visible_index_;
}
for (int i = 0; i < view_model_->view_size(); ++i) { for (int i = 0; i < view_model_->view_size(); ++i) {
bool visible = i <= last_visible_index_ || i > last_hidden_index_; bool visible = i <= last_visible_index_ || i > last_hidden_index_;
// Always show the app list. // Always show the app list.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment