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

Unified Diff: ui/app_list/app_list_view.h

Issue 10534051: app_list: Add transition for apps grid and search results. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 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/app_list_bubble_border.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_view.h
diff --git a/ui/app_list/app_list_view.h b/ui/app_list/app_list_view.h
index d2aa5e957ef6ec71b523eb16c69212d222a2a1db..d4a2556f017f38973834d391c9f9e7fb0145ecba 100644
--- a/ui/app_list/app_list_view.h
+++ b/ui/app_list/app_list_view.h
@@ -13,20 +13,14 @@
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/button/button.h"
-namespace views {
-class View;
-}
-
namespace app_list {
class AppListBubbleBorder;
class AppListModel;
-class AppsGridView;
class AppListViewDelegate;
-class PageSwitcher;
+class ContentsView;
class PaginationModel;
class SearchBoxView;
-class SearchResultListView;
// AppListView is the top-level view and controller of app list UI. It creates
// and hosts a AppsGridView and passes AppListModel to it for display.
@@ -59,8 +53,6 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
virtual views::View* GetInitiallyFocusedView() OVERRIDE;
// Overridden from views::View:
- virtual gfx::Size GetPreferredSize() OVERRIDE;
- virtual void Layout() OVERRIDE;
virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE;
// Overridden from views::ButtonListener:
@@ -80,15 +72,12 @@ class APP_LIST_EXPORT AppListView : public views::BubbleDelegateView,
scoped_ptr<AppListModel> model_;
scoped_ptr<AppListViewDelegate> delegate_;
- // PaginationModel for model view and page switcher.
+ // PaginationModel for apps grid view and page switcher.
scoped_ptr<PaginationModel> pagination_model_;
AppListBubbleBorder* bubble_border_; // Owned by views hierarchy.
-
- AppsGridView* apps_grid_view_; // Owned by views hierarchy.
- PageSwitcher* page_switcher_view_; // Owned by views hierarchy.
SearchBoxView* search_box_view_; // Owned by views hierarchy.
- SearchResultListView* search_results_view_; // Owned by views hierarchy.
+ ContentsView* contents_view_; // Owned by views hierarchy.
DISALLOW_COPY_AND_ASSIGN(AppListView);
};
« no previous file with comments | « ui/app_list/app_list_bubble_border.cc ('k') | ui/app_list/app_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698