Move app list search box into AppListView.

ui/app_list/views/app_list_main_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
 #define UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
@@ skipping 24 matching lines @@
 // when the user is signed in.
 class APP_LIST_EXPORT AppListMainView : public views::View,
                                         public AppsGridViewDelegate,
                                         public SearchBoxViewDelegate,
                                         public SearchResultListViewDelegate {
  public:
   // Takes ownership of |delegate|.
   explicit AppListMainView(AppListViewDelegate* delegate);
   virtual ~AppListMainView();
 
-  void Init(gfx::NativeView parent, int initial_apps_page);
+  void Init(gfx::NativeView parent,
+            int initial_apps_page,
+            SearchBoxView* search_box_view);
 
   void ShowAppListWhenReady();
 
   void ResetForShow();
 
   void Close();
 
   void Prerender();
 
   void ModelChanged();
@@ skipping 50 matching lines @@
   // Overridden from SearchBoxViewDelegate:
   virtual void QueryChanged(SearchBoxView* sender) override;
 
   // Overridden from SearchResultListViewDelegate:
   virtual void OnResultInstalled(SearchResult* result) override;
   virtual void OnResultUninstalled(SearchResult* result) override;
 
   AppListViewDelegate* delegate_;  // Owned by parent view (AppListView).
   AppListModel* model_;  // Unowned; ownership is handled by |delegate_|.
 
-  SearchBoxView* search_box_view_;  // Owned by views hierarchy.
+  // Created by AppListView. Owned by views hierarchy.
+  SearchBoxView* search_box_view_;
   ContentsView* contents_view_;  // Owned by views hierarchy.
 
   // Owned by views hierarchy. NULL in the non-experimental app list.
   ContentsSwitcherView* contents_switcher_view_;
 
   // A timer that fires when maximum allowed time to wait for icon loading has
   // passed.
   base::OneShotTimer<AppListMainView> icon_loading_wait_timer_;
 
   ScopedVector<IconLoader> pending_icon_loaders_;
 
   base::WeakPtrFactory<AppListMainView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListMainView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_APP_LIST_MAIN_VIEW_H_