| 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 73aac60a804c1d538f75172d74c5cf44e696e9bd..b429f8b7fd9979e1246f819d69224ff129986d59 100644
|
| --- a/ui/app_list/views/start_page_view.h
|
| +++ b/ui/app_list/views/start_page_view.h
|
| @@ -8,7 +8,7 @@
|
| #include "base/basictypes.h"
|
| #include "ui/app_list/app_list_model_observer.h"
|
| #include "ui/app_list/app_list_view_delegate_observer.h"
|
| -#include "ui/views/controls/button/button.h"
|
| +#include "ui/app_list/views/search_box_view_delegate.h"
|
| #include "ui/views/view.h"
|
|
|
| namespace app_list {
|
| @@ -21,7 +21,7 @@ class TileItemView;
|
|
|
| // The start page for the experimental app list.
|
| class StartPageView : public views::View,
|
| - public views::ButtonListener,
|
| + public SearchBoxViewDelegate,
|
| public AppListViewDelegateObserver,
|
| public AppListModelObserver {
|
| public:
|
| @@ -35,6 +35,7 @@ class StartPageView : public views::View,
|
| bool IsShowingSearchResults() const;
|
|
|
| const std::vector<TileItemView*>& tile_views() const { return tile_views_; }
|
| + SearchBoxView* dummy_search_box_view() { return search_box_view_; }
|
|
|
| // Overridden from views::View:
|
| virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
|
| @@ -42,16 +43,18 @@ class StartPageView : public views::View,
|
|
|
| private:
|
| enum ShowState {
|
| - SHOW_SEARCH_RESULTS,
|
| SHOW_START_PAGE,
|
| + SHOW_SEARCH_RESULTS,
|
| };
|
|
|
| + void InitInstantContainer();
|
| + void InitTilesContainer();
|
| +
|
| void SetShowState(ShowState show_state);
|
| void SetModel(AppListModel* model);
|
|
|
| - // Overridden from views::ButtonListener:
|
| - virtual void ButtonPressed(views::Button* sender,
|
| - const ui::Event& event) OVERRIDE;
|
| + // Overridden from SearchBoxViewDelegate:
|
| + virtual void QueryChanged(SearchBoxView* sender) OVERRIDE;
|
|
|
| // Overridden from AppListViewDelegateObserver:
|
| virtual void OnProfilesChanged() OVERRIDE;
|
| @@ -69,6 +72,7 @@ class StartPageView : public views::View,
|
|
|
| AppListViewDelegate* view_delegate_; // Owned by AppListView.
|
|
|
| + SearchBoxView* search_box_view_; // Owned by views hierarchy.
|
| SearchResultListView* results_view_; // Owned by views hierarchy.
|
| views::View* instant_container_; // Owned by views hierarchy.
|
| views::View* tiles_container_; // Owned by views hierarchy.
|
|
|