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

Side by Side Diff: ui/app_list/views/search_result_page_view.h

Issue 720663002: Move app list search tiles into SearchResultTileItemListView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_ 5 #ifndef UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_
6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_ 6 #define UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/app_list/app_list_export.h" 10 #include "ui/app_list/app_list_export.h"
11 #include "ui/app_list/app_list_model.h" 11 #include "ui/app_list/app_list_model.h"
12 #include "ui/app_list/views/search_result_container_view.h" 12 #include "ui/app_list/views/search_result_container_view.h"
13 13 #include "ui/views/view.h"
14 namespace views {
15 class View;
16 }
17 14
18 namespace app_list { 15 namespace app_list {
19 16
20 class AppListMainView; 17 class AppListMainView;
21 class AppListViewDelegate; 18 class AppListViewDelegate;
22 class SearchResultListView; 19 class SearchResultListView;
23 class SearchResultTileItemView; 20 class SearchResultTileItemListView;
24 21
25 // The start page for the experimental app list. 22 // The start page for the experimental app list.
26 class APP_LIST_EXPORT SearchResultPageView : public SearchResultContainerView { 23 class APP_LIST_EXPORT SearchResultPageView : public views::View {
Matt Giuca 2014/11/13 00:08:52 yay!
calamity 2014/11/13 03:44:50 But like, what if we have a SymmetricalAnimation :
27 public: 24 public:
28 SearchResultPageView(AppListMainView* app_list_main_view, 25 SearchResultPageView(AppListMainView* app_list_main_view,
29 AppListViewDelegate* view_delegate); 26 AppListViewDelegate* view_delegate);
30 ~SearchResultPageView() override; 27 ~SearchResultPageView() override;
31 28
32 // Overridden from views::View: 29 // Overridden from views::View:
33 bool OnKeyPressed(const ui::KeyEvent& event) override; 30 bool OnKeyPressed(const ui::KeyEvent& event) override;
34 31 void ChildPreferredSizeChanged(views::View* child) override;
35 // Overridden from SearchResultContainerView:
36 void Update() override;
37 32
38 private: 33 private:
39 void InitTilesContainer();
40
41 SearchResultListView* results_view_; // Owned by views hierarchy. 34 SearchResultListView* results_view_; // Owned by views hierarchy.
42 views::View* tiles_container_; // Owned by views hierarchy. 35 SearchResultTileItemListView* tiles_view_; // Owned by views hierarchy.
43
44 std::vector<SearchResultTileItemView*> tile_views_;
45 36
46 DISALLOW_COPY_AND_ASSIGN(SearchResultPageView); 37 DISALLOW_COPY_AND_ASSIGN(SearchResultPageView);
47 }; 38 };
48 39
49 } // namespace app_list 40 } // namespace app_list
50 41
51 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_ 42 #endif // UI_APP_LIST_VIEWS_SEARCH_RESULT_PAGE_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698