Move app list search box into AppListView.

ui/app_list/views/app_list_main_view.cc

 // Copyright 2013 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/app_list_main_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 21 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 
 namespace {
 
 // The maximum allowed time to wait for icon loading in milliseconds.
 const int kMaxIconLoadingWaitTimeInMs = 50;
 
-// A view that holds another view and takes its preferred size. This is used for
-// wrapping the search box view so it still gets laid out while hidden. This is
-// a separate class so it can notify the main view on search box visibility
-// change.
-class SearchBoxContainerView : public views::View {
- public:
-  SearchBoxContainerView(AppListMainView* host, SearchBoxView* search_box)
-      : host_(host), search_box_(search_box) {
-    SetLayoutManager(new views::FillLayout());
-    AddChildView(search_box);
-  }
-  virtual ~SearchBoxContainerView() {}
-
- private:
-  // Overridden from views::View:
-  virtual void ChildVisibilityChanged(views::View* child) OVERRIDE {
-    DCHECK_EQ(search_box_, child);
-    host_->NotifySearchBoxVisibilityChanged();
-  }
-
-  AppListMainView* host_;
-  SearchBoxView* search_box_;
-
-  DISALLOW_COPY_AND_ASSIGN(SearchBoxContainerView);
-};
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListMainView::IconLoader
 
 class AppListMainView::IconLoader : public AppListItemObserver {
  public:
   IconLoader(AppListMainView* owner,
              AppListItem* item,
              float scale)
@@ skipping 25 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // AppListMainView:
 
 AppListMainView::AppListMainView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       model_(delegate->GetModel()),
       search_box_view_(NULL),
       contents_view_(NULL),
       contents_switcher_view_(NULL),
       weak_ptr_factory_(this) {
-  SetLayoutManager(
-      new views::BoxLayout(views::BoxLayout::kVertical,
-                           0,
-                           0,
-                           switches::IsExperimentalAppListEnabled() ? 0 : 1));
-
-  search_box_view_ = new SearchBoxView(this, delegate);
-  views::View* container = new SearchBoxContainerView(this, search_box_view_);
-  if (switches::IsExperimentalAppListEnabled()) {
-    container->SetBorder(
-        views::Border::CreateEmptyBorder(kExperimentalWindowPadding,
-                                         kExperimentalWindowPadding,
-                                         0,
-                                         kExperimentalWindowPadding));
-  }
-  AddChildView(container);
+  SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
 }
 
 AppListMainView::~AppListMainView() {
   pending_icon_loaders_.clear();
 }
 
-void AppListMainView::Init(gfx::NativeView parent, int initial_apps_page) {
+void AppListMainView::Init(gfx::NativeView parent,
+                           int initial_apps_page,
+                           SearchBoxView* search_box_view) {
+  search_box_view_ = search_box_view;
   AddContentsViews();
 
   // Switch the apps grid view to the specified page.
   app_list::PaginationModel* pagination_model = GetAppsPaginationModel();
   if (pagination_model->is_valid_page(initial_apps_page))
     pagination_model->SelectPage(initial_apps_page, false);
 
   // Starts icon loading early.
   PreloadIcons(parent);
 }
 
 void AppListMainView::AddContentsViews() {
+  DCHECK(search_box_view_);
+
   contents_view_ = new ContentsView(this);
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     contents_switcher_view_ = new ContentsSwitcherView(contents_view_);
     contents_view_->SetContentsSwitcherView(contents_switcher_view_);
   }
   contents_view_->InitNamedPages(model_, delegate_);
   AddChildView(contents_view_);
   if (contents_switcher_view_)
     AddChildView(contents_switcher_view_);
 
   search_box_view_->set_contents_view(contents_view_);
+  UpdateSearchBoxVisibility();
 
   contents_view_->SetPaintToLayer(true);
   contents_view_->SetFillsBoundsOpaquely(false);
   contents_view_->layer()->SetMasksToBounds(true);
 
   delegate_->StartSearch();
 }
 
 void AppListMainView::ShowAppListWhenReady() {
   if (pending_icon_loaders_.empty()) {
@@ skipping 171 matching lines @@
   // Resubmit the query via a posted task so that all observers for the
   // uninstall notification are notified.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&AppListMainView::QueryChanged,
                  weak_ptr_factory_.GetWeakPtr(),
                  search_box_view_));
 }
 
 }  // namespace app_list