app_list: Update colors and sizes for v2.

ui/app_list/app_list_model_view.cc

 // Copyright (c) 2012 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/app_list_model_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_item_view.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/pagination_model.h"
+#include "ui/views/border.h"
+
+namespace {
+
+// Padding space in pixels for fixed layout.
+const int kTopLeftRightPadding = 15;
+const int kBottomPadding = 30;
+
+// Preferred tile size when showing in fixed layout.
+const int kPreferredTileWidth = 80;
+const int kPreferredTileHeight = 88;
+
+}  // namespace
 
 namespace app_list {
 
 AppListModelView::AppListModelView(views::ButtonListener* listener,
                                    PaginationModel* pagination_model)
     : model_(NULL),
       listener_(listener),
       pagination_model_(pagination_model),
       fixed_layout_(false),
       cols_(0),
@@ skipping 59 matching lines @@
   *cols = std::max(content_size.width() / tile_size.width(), 1);
   *rows = (num_of_tiles - 1) / (*cols) + 1;
 }
 
 void AppListModelView::SetLayout(int icon_size, int cols, int rows_per_page) {
   fixed_layout_ = true;
 
   icon_size_.SetSize(icon_size, icon_size);
   cols_ = cols;
   rows_per_page_ = rows_per_page;
+
+  set_border(views::Border::CreateEmptyBorder(kTopLeftRightPadding,
+                                              kTopLeftRightPadding,
+                                              kBottomPadding,
+                                              kTopLeftRightPadding));
 }
 
 void AppListModelView::SetModel(AppListModel* model) {
   if (model_)
     model_->RemoveObserver(this);
 
   model_ = model;
   if (model_)
     model_->AddObserver(this);
   Update();
@@ skipping 43 matching lines @@
 
     if (tiles_per_page())
       pagination_model_->SelectPage(selected_item_index_ / tiles_per_page());
   }
 }
 
 gfx::Size AppListModelView::GetPreferredSize() {
   if (!fixed_layout_)
     return gfx::Size();
 
-  gfx::Size tile_size = AppListItemView::GetPreferredSizeForIconSize(
-      icon_size_);
-  return gfx::Size(tile_size.width() * cols_,
-                   tile_size.height() * rows_per_page_);
+  gfx::Insets insets(GetInsets());
+  gfx::Size tile_size = gfx::Size(kPreferredTileWidth, kPreferredTileHeight);
+  return gfx::Size(tile_size.width() * cols_ + insets.width(),
+                   tile_size.height() * rows_per_page_ + insets.height());
 }
 
 void AppListModelView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty() || child_count() == 0)
     return;
 
   gfx::Size tile_size;
   if (fixed_layout_) {
-    tile_size = AppListItemView::GetPreferredSizeForIconSize(icon_size_);
+    tile_size = gfx::Size(kPreferredTileWidth, kPreferredTileHeight);
   } else {
     int rows = 0;
     CalculateLayout(rect.size(), child_count(), &icon_size_, &rows, &cols_);
 
     tile_size = AppListItemView::GetPreferredSizeForIconSize(
         icon_size_);
     rows_per_page_ = tile_size.height() ?
         std::max(rect.height() / tile_size.height(), 1) : 1;
 
     tile_size.set_width(std::max(rect.width() / (cols_ + 1),
@@ skipping 122 matching lines @@
 }
 
 void AppListModelView::TotalPagesChanged() {
 }
 
 void AppListModelView::SelectedPageChanged(int old_selected, int new_selected) {
   Layout();
 }
 
 }  // namespace app_list