cros: update app list item view for all apps grid view

ui/app_list/views/search_result_tile_item_view.cc

 // Copyright 2014 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 "ui/app_list/views/search_result_tile_item_view.h"
 
 #include "base/i18n/number_formatting.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_features.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/views/search_result_container_view.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 namespace app_list {
 
 namespace {
 
-constexpr int kRecommendationTileWidth = 96;
-constexpr int kRecommendationTileHeight = 99;
-constexpr int kRecommendationIconTopPadding = 24;
-constexpr int kRecommendationTitleSpacing = 10;
-constexpr int kRecommendationTileMaxWidth = 80;
-
 constexpr int kSearchTileWidth = 80;
 constexpr int kSearchTileHeight = 92;
 constexpr int kSearchTileTopPadding = 4;
 constexpr int kSearchTitleSpacing = 6;
 
-constexpr SkColor kRecommendationTileColor = SK_ColorWHITE;
-
 constexpr SkColor kSearchTitleColor =
     SkColorSetARGBMacro(0xDF, 0x00, 0x00, 0x00);
 constexpr SkColor kSearchAppRatingColor =
     SkColorSetARGBMacro(0x8F, 0x00, 0x00, 0x00);
 constexpr SkColor kSearchAppPriceColor =
     SkColorSetARGBMacro(0xFF, 0x0F, 0x9D, 0x58);
 
 }  // namespace
 
 SearchResultTileItemView::SearchResultTileItemView(
@@ skipping 57 matching lines @@
   SetPrice(item_->formatted_price());
 
   if (is_fullscreen_app_list_enabled_) {
     const gfx::FontList& base_font =
         ui::ResourceBundle::GetSharedInstance().GetFontList(
             ui::ResourceBundle::BaseFont);
 
     // Customize title UI
     if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
       title()->SetFontList(base_font.DeriveWithSizeDelta(1));
-      title()->SetEnabledColor(kRecommendationTileColor);
+      title()->SetEnabledColor(kGridTitleColorFullscreen);
     } else if (item_->display_type() == SearchResult::DISPLAY_TILE) {
       title()->SetFontList(base_font.DeriveWithSizeDelta(1));
       title()->SetEnabledColor(kSearchTitleColor);
     }
   }
 
   // Only refresh the icon if it's different from the old one. This prevents
   // flickering.
   if (!old_item || !item->icon().BackedBySameObjectAs(old_item->icon())) {
     OnIconChanged();
@@ skipping 92 matching lines @@
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   if (!is_fullscreen_app_list_enabled_ || !item_) {
     TileItemView::Layout();
     return;
   }
 
   if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION) {
-    rect.Inset(0, kRecommendationIconTopPadding, 0, 0);
+    rect.Inset(0, kGridIconTopPadding, 0, 0);
     icon()->SetBoundsRect(rect);
 
-    rect.Inset(0, kGridIconDimension + kRecommendationTitleSpacing, 0, 0);
+    rect.Inset(kGridTitleHorizontalPadding,
+               kGridIconDimension + kGridTitleSpacing,
+               kGridTitleHorizontalPadding, 0);
     rect.set_height(title()->GetPreferredSize().height());
-    rect.set_width(kRecommendationTileMaxWidth);
     title()->SetBoundsRect(rect);
   } else if (item_->display_type() == SearchResult::DISPLAY_TILE) {
     rect.Inset(0, kSearchTileTopPadding, 0, 0);
     icon()->SetBoundsRect(rect);
 
     if (badge()) {
       gfx::Rect badge_rect(rect);
       gfx::Size icon_size = icon()->GetImage().size();
       badge_rect.Offset(
           (icon_size.width() - kAppBadgeIconSize) / 2,
@@ skipping 19 matching lines @@
       price_->SetBoundsRect(price_rect);
     }
   } else {
     TileItemView::Layout();
   }
 }
 
 gfx::Size SearchResultTileItemView::CalculatePreferredSize() const {
   if (is_fullscreen_app_list_enabled_ && item_) {
     if (item_->display_type() == SearchResult::DISPLAY_RECOMMENDATION)
-      return gfx::Size(kRecommendationTileWidth, kRecommendationTileHeight);
-    if (item_->display_type() == SearchResult::DISPLAY_TILE)
+      return gfx::Size(kGridTileWidth, kGridTileHeight);
+    else if (item_->display_type() == SearchResult::DISPLAY_TILE)

[xiyuan, 2017/06/22 22:44:14]

no else after return

See
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...

[Qiang(Joe) Xu, 2017/06/22 22:55:38]

acknowledged, done.

       return gfx::Size(kSearchTileWidth, kSearchTileHeight);
   }
 
   return TileItemView::CalculatePreferredSize();
 }
 
 }  // namespace app_list