Move app list search box into AppListView.

ui/app_list/views/contents_view.h

 // 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.
 
 #ifndef UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 #define UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 86 matching lines @@
   void Prerender();
 
   AppsContainerView* apps_container_view() { return apps_container_view_; }
   StartPageView* start_page_view() { return start_page_view_; }
   SearchResultListView* search_results_view() { return search_results_view_; }
   views::View* GetPageView(int index);
 
   // 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;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
 
   // Overridden from PaginationModelObserver:
   virtual void TotalPagesChanged() OVERRIDE;
   virtual void SelectedPageChanged(int old_selected, int new_selected) OVERRIDE;
   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.
   void SetActivePageInternal(int page_index, bool show_search_results);
 
   // 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;
 
   // Calculates and sets the bounds for the subviews. If there is currently an
   // animation, this positions the views as appropriate for the current frame.
   void UpdatePageBounds();
 
   // Adds |view| as a new page to the end of the list of launcher pages. The
   // view is inserted as a child of the ContentsView, and a button with
@@ skipping 30 matching lines @@
 
   // Manages the pagination for the launcher pages.
   PaginationModel pagination_model_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentsView);
 };
 
 }  // namespace app_list
 
 #endif  // UI_APP_LIST_VIEWS_CONTENTS_VIEW_H_