Index: ui/app_list/views/start_page_view.cc |
diff --git a/ui/app_list/views/start_page_view.cc b/ui/app_list/views/start_page_view.cc |
index e1c0e2f40538521edc6a71f6b49ddc63a214d37c..caf08ba4f302299b3d879b4598f679ac16823ef0 100644 |
--- a/ui/app_list/views/start_page_view.cc |
+++ b/ui/app_list/views/start_page_view.cc |
@@ -4,11 +4,18 @@ |
#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" |
@@ -16,15 +23,18 @@ 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: |
@@ -64,14 +74,24 @@ class BarPlaceholderButton : public views::CustomButton { |
} // 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
calamity
2014/05/22 03:31:16
Ah yeah.. I forgot how much the app list had chang
|
+ 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)); |
@@ -79,6 +99,19 @@ StartPageView::StartPageView(AppListMainView* app_list_main_view, |
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 cal
calamity
2014/05/22 03:31:16
Done.
|
+ tiles_container_->AddChildView(tile); |
+ } |
} |
StartPageView::~StartPageView() { |
@@ -86,6 +119,11 @@ 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,
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, |