Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: ui/app_list/views/contents_view.h

Issue 657653002: Move app list search box into AppListView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/app_list/views/contents_switcher_view.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9546a0ee1210df1bd1da9dd32e25924463d3dcb8..3a11f4b362010ca50707614d34abbf8114f792a3 100644
--- a/ui/app_list/views/contents_view.h
+++ b/ui/app_list/views/contents_view.h
@@ -101,6 +101,17 @@ 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 search box bounds to use for content views that do not specify
+ // their own custom layout.
+ gfx::Rect GetDefaultSearchBoxBounds() const;
+
+ // Returns the content area bounds to use for content views that do not
+ // specify their own custom layout.
+ gfx::Rect GetDefaultContentsBounds() const;
+
// Overridden from views::View:
virtual gfx::Size GetPreferredSize() const override;
virtual void Layout() override;
@@ -112,9 +123,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.
@@ -123,6 +131,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;
« no previous file with comments | « ui/app_list/views/contents_switcher_view.cc ('k') | ui/app_list/views/contents_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698