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

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

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Rebased to fix merge conflicts and addressed comments. Created 3 years, 7 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
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 aad11258e7689f7a86aed7a4545fb07ffe878bc6..8c804d88e0f733b08bf13862eb993b597a8d13a9 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -60,7 +60,8 @@ class SearchAnswerContainerView : public views::View {
} // namespace
-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),
@@ -68,6 +69,7 @@ ContentsView::ContentsView(AppListMainView* app_list_main_view)
custom_page_view_(nullptr),
search_answer_container_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);
@@ -98,7 +100,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.

Powered by Google App Engine
This is Rietveld 408576698