diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 14:59:22 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-10 14:59:22 +0000 |
| commit | e8bafd672cc40fdcb25dd3fd4b390fa7d575c62a (patch) | |
| tree | 71c7e88f501048f8c99284ad47b235915fc08f09 /ash/launcher | |
| parent | ea2dffc923f02cfffeaf27b25b4e54c9344615d3 (diff) | |
| download | chromium_src-e8bafd672cc40fdcb25dd3fd4b390fa7d575c62a.zip chromium_src-e8bafd672cc40fdcb25dd3fd4b390fa7d575c62a.tar.gz chromium_src-e8bafd672cc40fdcb25dd3fd4b390fa7d575c62a.tar.bz2 | |
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
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher_view.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc index 2bc06d5..676c5d5 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. |