Move app list search box into AppListView.

ui/app_list/views/contents_view.h

Index: ui/app_list/views/contents_view.h
diff --git a/ui/app_list/views/contents_view.h b/ui/app_list/views/contents_view.h
index dbb74cf8d50c754e8ff572acad645d529abe3235..698f807ebaa8f5e675d75d6363b1402fd32c7dce 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -104,6 +104,15 @@ class APP_LIST_EXPORT ContentsView : public views::View,
   // Adds a blank launcher page. For use in tests only.
   void AddBlankPageForTesting();
 
+  // Returns the pagination model for the ContentsView.
+  const PaginationModel& pagination_model() { return pagination_model_; }
+
+  // Returns the default bounds of the search box.

[Matt Giuca, 2014/10/24 03:21:40]

I don't like the use of the word "default" in these comments. (They are
completely redundant for the method name.) Explain what it is in each case.

So in this case it's the bounds of the search box at the top of the page (when
not on the start page).

[calamity, 2014/10/24 06:13:08]

They're default because they will be customized by any of the actual content
views. I'd be confused by GetSearchBoxBounds() != search_box_view_->bounds();

+  gfx::Rect GetDefaultSearchBoxBounds() const;
+
+  // Returns the bounds of the default content area.

[Matt Giuca, 2014/10/24 03:21:40]

This is the bounds of the main area under the search box. (Maybe explain here
that the contents bounds fills up the entire window; this method just gives you
a guide as to where the user-interactable content should go.)

[calamity, 2014/10/24 06:13:08]

Done.
Eh. This isn't particularly true. It's just where you should go if you don't
want to be special..

+  gfx::Rect GetDefaultContentsBounds() const;
+
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE;
   virtual void Layout() OVERRIDE;
@@ -115,9 +124,6 @@ class APP_LIST_EXPORT ContentsView : public views::View,
   virtual void TransitionStarted() OVERRIDE;
   virtual void TransitionChanged() OVERRIDE;
 
-  // Returns the pagination model for the ContentsView.
-  const PaginationModel& pagination_model() { return pagination_model_; }
-
  private:
   // Sets the active launcher page, accounting for whether the change is for
   // search results.
@@ -126,6 +132,9 @@ class APP_LIST_EXPORT ContentsView : public views::View,
   // Invoked when active view is changed.
   void ActivePageChanged(bool show_search_results);
 
+  // Returns the size of the default content area.
+  gfx::Size GetDefaultContentsSize() const;
+
   // Gets the origin (the off-screen resting place) for a given launcher page
   // with index |page_index|.
   gfx::Rect GetOffscreenPageBounds(int page_index) const;