app_list: Add search box and search result view for v2.

ui/app_list/apps_grid_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 "ui/app_list/apps_grid_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;
+const int kPreferredTileWidth = 82;
+const int kPreferredTileHeight = 90;
 
 }  // namespace
 
 namespace app_list {
 
-AppListModelView::AppListModelView(views::ButtonListener* listener,
+AppsGridView::AppsGridView(views::ButtonListener* listener,
                                    PaginationModel* pagination_model)
     : model_(NULL),
       listener_(listener),
       pagination_model_(pagination_model),
       fixed_layout_(false),
       cols_(0),
       rows_per_page_(0),
       selected_item_index_(-1) {
   set_focusable(true);
   pagination_model_->AddObserver(this);
 }
 
-AppListModelView::~AppListModelView() {
+AppsGridView::~AppsGridView() {
   if (model_)
     model_->RemoveObserver(this);
   pagination_model_->RemoveObserver(this);
 }
 
-void AppListModelView::CalculateLayout(const gfx::Size& content_size,
+void AppsGridView::CalculateLayout(const gfx::Size& content_size,
                                        int num_of_tiles,
                                        gfx::Size* icon_size,
                                        int* rows,
                                        int* cols) {
   DCHECK(!content_size.IsEmpty() && num_of_tiles);
 
   // Icon sizes to try.
   const int kIconSizes[] = { 128, 96, 64, 48, 32 };
 
   double aspect = static_cast<double>(content_size.width()) /
@@ skipping 30 matching lines @@
 
     DCHECK((*rows) * (*cols) >= num_of_tiles);
     return;
   }
 
   // No icon size that could fit all tiles.
   *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) {
+void AppsGridView::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) {
+void AppsGridView::SetModel(AppListModel::Apps* model) {
   if (model_)
     model_->RemoveObserver(this);
 
   model_ = model;
   if (model_)
     model_->AddObserver(this);
   Update();
 }
 
-void AppListModelView::SetSelectedItem(AppListItemView* item) {
+void AppsGridView::SetSelectedItem(AppListItemView* item) {
   int index = GetIndexOf(item);
   if (index >= 0)
     SetSelectedItemByIndex(index);
 }
 
-void AppListModelView::ClearSelectedItem(AppListItemView* item) {
+void AppsGridView::ClearSelectedItem(AppListItemView* item) {
   int index = GetIndexOf(item);
   if (index == selected_item_index_)
     SetSelectedItemByIndex(-1);
 }
 
-void AppListModelView::Update() {
-  selected_item_index_ = -1;
-  RemoveAllChildViews(true);
-  if (!model_ || model_->item_count() == 0)
-    return;
-
-  for (size_t i = 0; i < model_->item_count(); ++i)
-    AddChildView(new AppListItemView(this, model_->GetItemAt(i), listener_));
-
-  Layout();
-  SchedulePaint();
-}
-
-AppListItemView* AppListModelView::GetItemViewAtIndex(int index) {
-  return static_cast<AppListItemView*>(child_at(index));
-}
-
-void AppListModelView::SetSelectedItemByIndex(int index) {
-  if (selected_item_index_ == index)
-    return;
-
-  if (selected_item_index_ >= 0)
-    GetItemViewAtIndex(selected_item_index_)->SetSelected(false);
-
-  if (index < 0 || index >= child_count()) {
-    selected_item_index_ = -1;
-  } else {
-    selected_item_index_ = index;
-    GetItemViewAtIndex(selected_item_index_)->SetSelected(true);
-
-    if (tiles_per_page())
-      pagination_model_->SelectPage(selected_item_index_ / tiles_per_page());
-  }
-}
-
-gfx::Size AppListModelView::GetPreferredSize() {
+gfx::Size AppsGridView::GetPreferredSize() {
   if (!fixed_layout_)
     return gfx::Size();
 
   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() {
+void AppsGridView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty() || child_count() == 0)
     return;
 
   gfx::Size tile_size;
   if (fixed_layout_) {
     tile_size = gfx::Size(kPreferredTileWidth, kPreferredTileHeight);
   } else {
     int rows = 0;
     CalculateLayout(rect.size(), child_count(), &icon_size_, &rows, &cols_);
@@ skipping 39 matching lines @@
     view->SetVisible(rect.Contains(current_tile));
 
     current_tile.Offset(tile_size.width(), 0);
     if ((i + 1) % cols_ == 0) {
       current_tile.set_x(grid_rect.x());
       current_tile.set_y(current_tile.y() + tile_size.height());
     }
   }
 }
 
-bool AppListModelView::OnKeyPressed(const views::KeyEvent& event) {
+bool AppsGridView::OnKeyPressed(const views::KeyEvent& event) {
   bool handled = false;
   if (selected_item_index_ >= 0)
     handled = GetItemViewAtIndex(selected_item_index_)->OnKeyPressed(event);
 
   if (!handled) {
     switch (event.key_code()) {
       case ui::VKEY_LEFT:
         SetSelectedItemByIndex(std::max(selected_item_index_ - 1, 0));
         return true;
       case ui::VKEY_RIGHT:
@@ skipping 28 matching lines @@
         }
       }
       default:
         break;
     }
   }
 
   return handled;
 }
 
-bool AppListModelView::OnKeyReleased(const views::KeyEvent& event) {
+bool AppsGridView::OnKeyReleased(const views::KeyEvent& event) {
   bool handled = false;
   if (selected_item_index_ >= 0)
     handled = GetItemViewAtIndex(selected_item_index_)->OnKeyReleased(event);
 
   return handled;
 }
 
-void AppListModelView::OnPaintFocusBorder(gfx::Canvas* canvas) {
+void AppsGridView::OnPaintFocusBorder(gfx::Canvas* canvas) {
   // Override to not paint focus frame.
 }
 
-void AppListModelView::ListItemsAdded(size_t start, size_t count) {
+void AppsGridView::Update() {
+  selected_item_index_ = -1;
+  RemoveAllChildViews(true);
+  if (!model_ || model_->item_count() == 0)
+    return;
+
+  for (size_t i = 0; i < model_->item_count(); ++i)
+    AddChildView(new AppListItemView(this, model_->GetItemAt(i), listener_));
+
+  Layout();
+  SchedulePaint();
+}
+
+AppListItemView* AppsGridView::GetItemViewAtIndex(int index) {
+  return static_cast<AppListItemView*>(child_at(index));
+}
+
+void AppsGridView::SetSelectedItemByIndex(int index) {
+  if (selected_item_index_ == index)
+    return;
+
+  if (selected_item_index_ >= 0)
+    GetItemViewAtIndex(selected_item_index_)->SetSelected(false);
+
+  if (index < 0 || index >= child_count()) {
+    selected_item_index_ = -1;
+  } else {
+    selected_item_index_ = index;
+    GetItemViewAtIndex(selected_item_index_)->SetSelected(true);
+
+    if (tiles_per_page())
+      pagination_model_->SelectPage(selected_item_index_ / tiles_per_page());
+  }
+}
+
+void AppsGridView::ListItemsAdded(size_t start, size_t count) {
   for (size_t i = start; i < start + count; ++i) {
     AddChildViewAt(new AppListItemView(this, model_->GetItemAt(i), listener_),
                    i);
   }
   Layout();
   SchedulePaint();
 }
 
-void AppListModelView::ListItemsRemoved(size_t start, size_t count) {
+void AppsGridView::ListItemsRemoved(size_t start, size_t count) {
   for (size_t i = 0; i < count; ++i)
     delete child_at(start);
 
   Layout();
   SchedulePaint();
 }
 
-void AppListModelView::ListItemsChanged(size_t start, size_t count) {
+void AppsGridView::ListItemsChanged(size_t start, size_t count) {
   NOTREACHED();
 }
 
-void AppListModelView::TotalPagesChanged() {
+void AppsGridView::TotalPagesChanged() {
 }
 
-void AppListModelView::SelectedPageChanged(int old_selected, int new_selected) {
+void AppsGridView::SelectedPageChanged(int old_selected, int new_selected) {
   Layout();
 }
 
 }  // namespace app_list