Move shelf item tooltip flag from delegate to item.

ash/common/shelf/shelf_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/common/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/common/ash_constants.h"
@@ skipping 509 matching lines @@
   gfx::Rect tooltip_bounds;
   for (int i = 0; i < child_count(); ++i) {
     const views::View* child = child_at(i);
     if (child != overflow_button_ && ShouldShowTooltipForView(child))
       tooltip_bounds.Union(child->GetMirroredBounds());
   }
   return !tooltip_bounds.Contains(cursor_location);
 }
 
 bool ShelfView::ShouldShowTooltipForView(const views::View* view) const {
-  if (view == GetAppListButton() &&
-      WmShell::Get()->GetAppListTargetVisibility()) {
+  // TODO(msw): Push this app list state into ShelfItem::shows_tooltip.
+  if (view == GetAppListButton() && GetAppListButton()->is_showing_app_list())
     return false;
-  }
   const ShelfItem* item = ShelfItemForView(view);
-  if (!item)
-    return false;
-  return model_->GetShelfItemDelegate(item->id)->ShouldShowTooltip();
+  return item && item->shows_tooltip;
 }
 
 base::string16 ShelfView::GetTitleForView(const views::View* view) const {
   const ShelfItem* item = ShelfItemForView(view);
   if (!item || !model_->GetShelfItemDelegate(item->id))
     return base::string16();
   return model_->GetShelfItemDelegate(item->id)->GetTitle();
 }
 
 gfx::Rect ShelfView::GetVisibleItemsBoundsInScreen() {
@@ skipping 1365 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = wm_shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash