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

Unified Diff: ui/app_list/views/contents_view.cc

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Removed header include in shell.h that was causing gn check failure. Created 3 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/contents_view.h ('k') | ui/app_list/views/search_box_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 9a3a73b773818c69e7dc832b309f142f7b52edb5..ff96d24ee85bf038b1b74841c0c98e76e5399254 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -29,13 +29,15 @@
namespace app_list {
-ContentsView::ContentsView(AppListMainView* app_list_main_view)
+ContentsView::ContentsView(AppListMainView* app_list_main_view,
+ AppListView* app_list_view)
: model_(nullptr),
apps_container_view_(nullptr),
search_results_page_view_(nullptr),
start_page_view_(nullptr),
custom_page_view_(nullptr),
app_list_main_view_(app_list_main_view),
+ app_list_view_(app_list_view),
page_before_search_(0) {
pagination_model_.SetTransitionDurations(kPageTransitionDurationInMs,
kOverscrollPageTransitionDurationMs);
@@ -64,7 +66,8 @@ void ContentsView::Init(AppListModel* model) {
}
// Start page.
- start_page_view_ = new StartPageView(app_list_main_view_, view_delegate);
+ start_page_view_ =
+ new StartPageView(app_list_main_view_, view_delegate, app_list_view_);
AddLauncherPage(start_page_view_, AppListModel::STATE_START);
// Search results UI.
« no previous file with comments | « ui/app_list/views/contents_view.h ('k') | ui/app_list/views/search_box_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698