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

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

Issue 307333002: Add search results to experimental app list start page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments, fix for breaking a test Created 6 years, 6 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/search_result_list_view.cc ('k') | ui/app_list/views/start_page_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/start_page_view.h
diff --git a/ui/app_list/views/start_page_view.h b/ui/app_list/views/start_page_view.h
index 154520936cdbc27122a54a212de2dfb79f659db0..73aac60a804c1d538f75172d74c5cf44e696e9bd 100644
--- a/ui/app_list/views/start_page_view.h
+++ b/ui/app_list/views/start_page_view.h
@@ -16,6 +16,7 @@ namespace app_list {
class AppListMainView;
class AppListModel;
class AppListViewDelegate;
+class SearchResultListView;
class TileItemView;
// The start page for the experimental app list.
@@ -29,10 +30,23 @@ class StartPageView : public views::View,
virtual ~StartPageView();
void Reset();
+ void ShowSearchResults();
+
+ bool IsShowingSearchResults() const;
const std::vector<TileItemView*>& tile_views() const { return tile_views_; }
+ // Overridden from views::View:
+ virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
+ virtual void Layout() OVERRIDE;
+
private:
+ enum ShowState {
+ SHOW_SEARCH_RESULTS,
+ SHOW_START_PAGE,
+ };
+
+ void SetShowState(ShowState show_state);
void SetModel(AppListModel* model);
// Overridden from views::ButtonListener:
@@ -55,11 +69,14 @@ class StartPageView : public views::View,
AppListViewDelegate* view_delegate_; // Owned by AppListView.
+ SearchResultListView* results_view_; // Owned by views hierarchy.
views::View* instant_container_; // Owned by views hierarchy.
views::View* tiles_container_; // Owned by views hierarchy.
std::vector<TileItemView*> tile_views_;
+ ShowState show_state_;
+
DISALLOW_COPY_AND_ASSIGN(StartPageView);
};
« no previous file with comments | « ui/app_list/views/search_result_list_view.cc ('k') | ui/app_list/views/start_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698