Simply remove dummy app icons from the home card.

athena/home/athena_start_page_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 "athena/home/athena_start_page_view.h"
 
 #include "athena/home/home_card_constants.h"
 #include "athena/system/public/system_ui.h"
 #include "base/bind.h"
 #include "base/strings/string_util.h"
@@ skipping 29 matching lines @@
 const int kWebViewWidth = 500;
 const int kWebViewHeight = 105;
 const int kSearchBoxBorderWidth = 1;
 const int kSearchBoxCornerRadius = 2;
 
 // Taken from the mock. The width is not specified by pixel but the search box
 // covers 6 icons with margin.
 const int kSearchBoxWidth = kIconSize * 6 + kIconMargin * 7;
 const int kSearchBoxHeight = 40;
 
+gfx::Size GetIconContainerSize() {
+  return gfx::Size(kIconSize *  kMaxIconNum + kIconMargin * (kMaxIconNum - 1),
+                   kIconSize);
+}
+
 class PlaceHolderButton : public views::ImageButton,
                           public views::ButtonListener {
  public:
   PlaceHolderButton()
       : ImageButton(this) {
     gfx::Canvas canvas(gfx::Size(kIconSize, kIconSize), 1.0f, true);
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
     paint.setColor(SkColorSetRGB(86, 119, 252));
     paint.setFlags(SkPaint::kAntiAlias_Flag);
@@ skipping 141 matching lines @@
   app_icon_container_ = new views::View();
   AddChildView(app_icon_container_);
   app_icon_container_->SetPaintToLayer(true);
   app_icon_container_->layer()->SetFillsBoundsOpaquely(false);
   app_icon_container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kIconMargin));
   app_list::AppListItemList* top_level =
       view_delegate->GetModel()->top_level_item_list();
   for (size_t i = 0; i < std::min(top_level->item_count(), kMaxIconNum); ++i)
     app_icon_container_->AddChildView(new AppIconButton(top_level->item_at(i)));
-  app_icon_container_->SetSize(app_icon_container_->GetPreferredSize());
+  app_icon_container_->SetSize(GetIconContainerSize());
 
   control_icon_container_ = new views::View();
   control_icon_container_->SetPaintToLayer(true);
   control_icon_container_->SetFillsBoundsOpaquely(false);
   AddChildView(control_icon_container_);
   control_icon_container_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kIconMargin));
   for (size_t i = 0; i < kMaxIconNum; ++i)
     control_icon_container_->AddChildView(new PlaceHolderButton());
-  control_icon_container_->SetSize(control_icon_container_->GetPreferredSize());
+  control_icon_container_->SetSize(GetIconContainerSize());
 
   search_box_view_ = new app_list::SearchBoxView(this, view_delegate);
   search_box_view_->set_contents_view(this);
   search_box_view_->search_box()->set_id(kHomeCardSearchBoxId);
   search_box_container_ = new SearchBoxContainer(search_box_view_);
   search_box_container_->SetPaintToLayer(true);
   search_box_container_->SetFillsBoundsOpaquely(false);
   search_box_container_->SetSize(search_box_container_->GetPreferredSize());
   AddChildView(search_box_container_);
 }
@@ skipping 193 matching lines @@
   base::TrimWhitespace(
       delegate_->GetModel()->search_box()->text(), base::TRIM_ALL, &query);
 
   if (!query.empty())
     search_results_view_->SetSelectedIndex(0);
 
   LayoutSearchResults(!query.empty());
 }
 
 }  // namespace athena