ash:Shelf - Enable Alternate Shelf and Side Shelf by default.

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 774 matching lines @@
     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() &&
-      last_visible_index_ > 0)
+      last_visible_index_ > 0 && last_visible_index_ < last_button_index)

[James Cook, 2013/08/22 00:19:12]

Should this be part of a separate CL, or is it needed to get tests to pass?

[Harry McCleave, 2013/08/27 00:37:00]

This fixes an issue asserted by a unit test, if there is enough space to show
all the buttons but overflow state is triggered by panels or notifications
(stuff from the right) without this a button would be incorrectly hidden to
create space for the overflow (rather than correctly hiding an element from the
right).

     --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) {
     DCHECK_NE(0, view_model_->view_size());
     if (last_visible_index_ == -1) {
       x = shelf->SelectValueForShelfAlignment(inset, 0, 0, inset);
       y = shelf->SelectValueForShelfAlignment(0, inset, inset, 0);
-    } else if (last_visible_index_ == last_button_index) {
+    } else if (last_visible_index_ == last_button_index
+        && !ash::switches::UseAlternateShelfLayout()) {
       x = view_model_->ideal_bounds(last_visible_index_).x();
       y = view_model_->ideal_bounds(last_visible_index_).y();
     } else {
       x = shelf->PrimaryAxisValue(
           view_model_->ideal_bounds(last_visible_index_).right(),
           view_model_->ideal_bounds(last_visible_index_).x());
       y = shelf->PrimaryAxisValue(
           view_model_->ideal_bounds(last_visible_index_).y(),
           view_model_->ideal_bounds(last_visible_index_).bottom());
     }
@@ skipping 884 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