Simply remove dummy app icons from the home card.

BUG=415745
R=oshima@chromium.org
TEST=manually

Review URL: https://codereview.chromium.org/583503003

Cr-Commit-Position: refs/heads/master@{#295617}

athena/extensions/extension_app_model_builder.cc

@@ -20,43 +20,6 @@ namespace athena {
 
 namespace {
 
-gfx::ImageSkia CreateFlatColorImage(SkColor color) {
-  SkBitmap bitmap;
-  bitmap.allocN32Pixels(extension_misc::EXTENSION_ICON_MEDIUM,
-                        extension_misc::EXTENSION_ICON_MEDIUM);
-  bitmap.eraseColor(color);
-  return gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
-}
-
-// Same dummy item.
-class DummyItem : public app_list::AppListItem {
- public:
-  DummyItem(const std::string& id,
-            const GURL& url,
-            SkColor color,
-            content::BrowserContext* browser_context)
-      : app_list::AppListItem(id),
-        url_(url),
-        browser_context_(browser_context) {
-
-    SetIcon(CreateFlatColorImage(color), false /* has_shadow */);
-    SetName(id);
-  }
-
- private:
-  // Overridden from app_list::AppListItem:
-  virtual void Activate(int event_flags) OVERRIDE {
-    ActivityManager::Get()->AddActivity(
-        ActivityFactory::Get()->CreateWebActivity(
-            browser_context_, base::string16(), url_));
-  }
-
-  GURL url_;
-  content::BrowserContext* browser_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(DummyItem);
-};
-
 class AppItem : public app_list::AppListItem {
  public:
   AppItem(scoped_refptr<const extensions::Extension> extension,
@@ -111,20 +74,6 @@ void ExtensionAppModelBuilder::PopulateApps(app_list::AppListModel* model) {
           new AppItem(*iter, browser_context_)));
     }
   }
-
-  model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
-      "mail", GURL("http://gmail.com/"), SK_ColorRED, browser_context_)));
-  model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
-      "calendar", GURL("https://calendar.google.com/"),
-      SK_ColorBLUE, browser_context_)));
-  model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
-      "video", GURL("http://youtube.com/"), SK_ColorGREEN, browser_context_)));
-  model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
-      "music", GURL("http://play.google.com/music"),
-      SK_ColorYELLOW, browser_context_)));
-  model->AddItem(scoped_ptr<app_list::AppListItem>(new DummyItem(
-      "contact", GURL("https://www.google.com/contacts"),
-      SK_ColorCYAN, browser_context_)));
 }
 
 }  // namespace athena

athena/home/athena_start_page_view.cc

@@ -47,6 +47,11 @@ const int kSearchBoxCornerRadius = 2;
 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:
@@ -208,7 +213,7 @@ AthenaStartPageView::AthenaStartPageView(
       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);
@@ -218,7 +223,7 @@ AthenaStartPageView::AthenaStartPageView(
       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);