Add tiles to the experimental app list start page.

ui/app_list/views/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 "ui/app_list/views/start_page_view.h"
 
+#include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/app_list/app_list_constants.h"
+#include "ui/app_list/app_list_item.h"
+#include "ui/app_list/app_list_model.h"
+#include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/views/app_list_main_view.h"
+#include "ui/app_list/views/tile_item_view.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/controls/button/custom_button.h"
+#include "ui/views/controls/image_view.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/box_layout.h"
 
 namespace app_list {
 
 namespace {
 
-const int kTopMargin = 20;
+const int kTopMargin = 30;
 
 const int kWebViewWidth = 200;
-const int kWebViewHeight = 95;
+const int kWebViewHeight = 105;
 
-const int kInstantContainerSpacing = 15;
-const int kBarPlaceholderWidth = 350;
+const int kInstantContainerSpacing = 20;
+const int kBarPlaceholderWidth = 490;
 const int kBarPlaceholderHeight = 30;
 
+const int kNumStartPageTiles = 5;
+const int kTileSpacing = 10;
+
 // A button that is the placeholder for the search bar in the start page view.
 class BarPlaceholderButton : public views::CustomButton {
  public:
   explicit BarPlaceholderButton(views::ButtonListener* listener)
       : views::CustomButton(listener) {}
 
   virtual ~BarPlaceholderButton() {}
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE {
@@ skipping 19 matching lines @@
     paint.setColor(base_color);
     canvas->DrawRect(rect, paint);
   }
 
   DISALLOW_COPY_AND_ASSIGN(BarPlaceholderButton);
 };
 
 }  // namespace
 
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
-                             content::WebContents* start_page_web_contents)
+                             AppListViewDelegate* view_delegate)
     : app_list_main_view_(app_list_main_view),
-      instant_container_(new views::View) {
-  AddChildView(instant_container_);
-  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
-  instant_container_->SetLayoutManager(new views::BoxLayout(
+      model_(view_delegate->GetModel()),

[tapted, 2014/05/20 05:22:31]

What if GetModel() returns NULL?

Also, the model in the AppListViewDelegate changes when
AppListViewDelegateObserver::OnProfilesChanged() fires -- where is that handled?

It might be nicer to hold on to the AppListViewDelegate, which we know won't
change, rather than the model. And then use view_delegate_->GetModel() inside
::Reset()

[calamity, 2014/05/22 03:31:16]

Ah yeah.. I forgot how much the app list had changed since I was last here.

Done and done.

+      instant_container_(new views::View),
+      tiles_container_(new views::View) {
+  SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kVertical, 0, kTopMargin, kInstantContainerSpacing));
 
+  // The view containing the start page WebContants and the BarPlaceholder.

[tapted, 2014/05/20 05:22:31]

typo: WebContants -> WebContents

[calamity, 2014/05/22 03:31:16]

Done.

+  AddChildView(instant_container_);
+  views::BoxLayout* instant_layout_manager = new views::BoxLayout(
+      views::BoxLayout::kVertical, 0, 0, kInstantContainerSpacing);
+  instant_layout_manager->set_main_axis_alignment(
+      views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
+  instant_container_->SetLayoutManager(instant_layout_manager);
+
+  content::WebContents* start_page_web_contents =
+      view_delegate->GetStartPageContents();
   views::WebView* web_view =
       new views::WebView(start_page_web_contents->GetBrowserContext());
   web_view->SetPreferredSize(gfx::Size(kWebViewWidth, kWebViewHeight));
   web_view->SetWebContents(start_page_web_contents);
 
   instant_container_->AddChildView(web_view);
   instant_container_->AddChildView(new BarPlaceholderButton(this));
+
+  // The view containing the start page tiles.
+  AddChildView(tiles_container_);
+  views::BoxLayout* tiles_layout_manager =
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, kTileSpacing);
+  tiles_layout_manager->set_main_axis_alignment(
+      views::BoxLayout::MAIN_AXIS_ALIGNMENT_CENTER);
+  tiles_container_->SetLayoutManager(tiles_layout_manager);
+  for (size_t i = 0; i < kNumStartPageTiles; ++i) {
+    TileItemView* tile = new TileItemView();
+    tile->SetAppListItem(model_->top_level_item_list()->item_at(i));

[tapted, 2014/05/20 05:22:31]

nit: might be good to skip this line, and just call Reset() at the end of the
constructor, to ensure initial state and "reset" are consistent

[calamity, 2014/05/22 03:31:16]

Done.

+    tiles_container_->AddChildView(tile);
+  }
 }
 
 StartPageView::~StartPageView() {
 }
 
 void StartPageView::Reset() {
   instant_container_->SetVisible(true);
+  for (size_t i = 0; i < kNumStartPageTiles; ++i) {
+    TileItemView* tile =
+        static_cast<TileItemView*>(tiles_container_->child_at(i));

[tapted, 2014/05/20 05:22:31]

I think this would be nicer in a private function, just to isolate the
static_cast:

TileItemView* StartPageView::GetTileViewAt(int index) {
  return static_cast<TileItemView*>(tiles_container_->child_at(i));
}

[calamity, 2014/05/22 03:31:16]

Done.

+    tile->SetAppListItem(model_->top_level_item_list()->item_at(i));

[tapted, 2014/05/20 05:22:31]

What if `i` >= model_->top_level_item_list().size() ?

[calamity, 2014/05/22 03:31:16]

Done.

+  }
 }
 
 void StartPageView::ButtonPressed(views::Button* sender,
                                   const ui::Event& event) {
   app_list_main_view_->OnStartPageSearchButtonPressed();
   instant_container_->SetVisible(false);
 }
 
 }  // namespace app_list