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

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

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Migrated from wm_shelf to shelf 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/app_list_main_view.cc
diff --git a/ui/app_list/views/app_list_main_view.cc b/ui/app_list/views/app_list_main_view.cc
index 13f77b987917e78440028f37be035eed83e4e976..c0c5fb86b948183b30f376a7f1e6e4800bd46628 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -62,8 +62,10 @@ AppListMainView::~AppListMainView() {
void AppListMainView::Init(gfx::NativeView parent,
int initial_apps_page,
- SearchBoxView* search_box_view) {
+ SearchBoxView* search_box_view,
+ AppListView* app_list_view) {
search_box_view_ = search_box_view;
+ app_list_view_ = app_list_view;
AddContentsViews();
// Switch the apps grid view to the specified page.
@@ -76,8 +78,7 @@ void AppListMainView::Init(gfx::NativeView parent,
void AppListMainView::AddContentsViews() {
DCHECK(search_box_view_);
-
- contents_view_ = new ContentsView(this);
+ contents_view_ = new ContentsView(this, app_list_view_);
contents_view_->Init(model_);
AddChildView(contents_view_);

Powered by Google App Engine
This is Rietveld 408576698