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

ash/launcher/launcher_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/launcher/launcher_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/ash_switches.h"
@@ skipping 764 matching lines @@
   else
     last_visible_index_ = DetermineLastVisibleIndex(
         end_position - inset - 2 * button_size);
   last_hidden_index_ = DetermineFirstVisiblePanelIndex(end_position) - 1;
   bool show_overflow =
       ((ash::switches::UseAlternateShelfLayout() ? 0 : 1) +
       last_visible_index_ < last_button_index ||
       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.
     if (!ash::switches::UseAlternateShelfLayout())
       visible |= (i == last_button_index);
     view_model_->view_at(i)->SetVisible(visible);
   }
 
   overflow_button_->SetVisible(show_overflow);
   if (show_overflow) {
@@ skipping 897 matching lines @@
 bool LauncherView::ShouldShowTooltipForView(const views::View* view) const {
   if (view == GetAppListButtonView() &&
       Shell::GetInstance()->GetAppListWindow())
     return false;
   const LauncherItem* item = LauncherItemForView(view);
   return (!item || delegate_->ShouldShowTooltip(*item));
 }
 
 }  // namespace internal
 }  // namespace ash