summaryrefslogtreecommitdiffstats
path: root/ui/app_list/app_list.gyp
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-25 00:16:17 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-25 00:16:17 +0000
commitef59e6c4064973e58c923fbcfb51e68911cff8d8 (patch)
tree74b264a7a69765dc3c9b716b4f4b969612ec63e8 /ui/app_list/app_list.gyp
parent38ddaff588d764ac6a92ec1e8b6766732ba92efd (diff)
downloadchromium_src-ef59e6c4064973e58c923fbcfb51e68911cff8d8.zip
chromium_src-ef59e6c4064973e58c923fbcfb51e68911cff8d8.tar.gz
chromium_src-ef59e6c4064973e58c923fbcfb51e68911cff8d8.tar.bz2
app_list: Add search box and search result view for v2.
- Add a SearchBoxModel that represents search box's icon, placeholder text, user typed text and selection model (current selection and cursor position); - Add a SearchBoxView that displays SearchBoxModel and observes SearchBoxModel changes via SearchBoxModelObserver; When user typed/changed text in search box, the view also fires query changed notification to its SearchBoxViewDelegate; - Add a SearchResult that carries an icon, two tagged texts; - Add a SearchResultView that displays a SearchResult; - Change AppListModel to be a master model that has three sub models: apps list, search box and search results; - Add a SearchResultListView that display search results sub model of AppListModel using a list of SeachResultView; The view supports up/down key navigation and when user selects a result via mouse click or enter key, it asks its SearchResultListViewDelegate to OpenResult; - Update AppListViewDelegate: - Add new methods: StartSearch, StopSearch and OpenResult; - Deleted no-longer needed UpdateModel method; - Rename OnAppListItemActivated -> ActivateAppListItem; - Update ash_shell's app_list to support a simple substr match search; - Add a SearchBuilder that implements the search via AutoCompleteController; - Other changes: - Rename AppListModelBuilder -> AppsModelBuilder; - Rename AppListModelView -> AppsGridView; BUG=125964 TEST=Manual. In ash_shell, it searches the 5 example apps. In ash/chrome, it should show similar results as omnibox. Review URL: https://chromiumcodereview.appspot.com/10386224 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138938 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/app_list/app_list.gyp')
-rw-r--r--ui/app_list/app_list.gyp19
1 files changed, 16 insertions, 3 deletions
diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp
index effe6f9..ec5ff6d 100644
--- a/ui/app_list/app_list.gyp
+++ b/ui/app_list/app_list.gyp
@@ -32,11 +32,11 @@
'app_list_item_view.h',
'app_list_model.cc',
'app_list_model.h',
- 'app_list_model_view.cc',
- 'app_list_model_view.h',
'app_list_view.cc',
'app_list_view.h',
'app_list_view_delegate.h',
+ 'apps_grid_view.cc',
+ 'apps_grid_view.h',
'drop_shadow_label.cc',
'drop_shadow_label.h',
'icon_cache.cc',
@@ -46,6 +46,19 @@
'pagination_model.cc',
'pagination_model.h',
'pagination_model_observer.h',
+ 'search_box_model.h',
+ 'search_box_model.cc',
+ 'search_box_model_observer.h',
+ 'search_box_view.cc',
+ 'search_box_view.h',
+ 'search_box_view_delegate.h',
+ 'search_result.cc',
+ 'search_result.h',
+ 'search_result_view.cc',
+ 'search_result_view.h',
+ 'search_result_list_view.cc',
+ 'search_result_list_view.h',
+ 'search_result_list_view_delegate.h',
],
},
{
@@ -62,7 +75,7 @@
'app_list',
],
'sources': [
- 'app_list_model_view_unittest.cc',
+ 'apps_grid_view_unittest.cc',
'run_all_unittests.cc',
],
},