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

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

Issue 2934673002: Revert of Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: 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/app_list_main_view.h ('k') | ui/app_list/views/app_list_main_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 eb060ac02d6ac406d0a7d27946cc83afed4bbf42..f913e11cc5698a50caa91ccfe289c56999ad998b 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -44,13 +44,11 @@
////////////////////////////////////////////////////////////////////////////////
// AppListMainView:
-AppListMainView::AppListMainView(AppListViewDelegate* delegate,
- AppListView* app_list_view)
+AppListMainView::AppListMainView(AppListViewDelegate* delegate)
: delegate_(delegate),
model_(delegate->GetModel()),
search_box_view_(nullptr),
- contents_view_(nullptr),
- app_list_view_(app_list_view) {
+ contents_view_(nullptr) {
SetLayoutManager(
features::IsAnswerCardEnabled()
? static_cast<views::LayoutManager*>(new views::FillLayout)
@@ -79,7 +77,8 @@
void AppListMainView::AddContentsViews() {
DCHECK(search_box_view_);
- contents_view_ = new ContentsView(this, app_list_view_);
+
+ contents_view_ = new ContentsView(this);
contents_view_->Init(model_);
AddChildView(contents_view_);
« no previous file with comments | « ui/app_list/views/app_list_main_view.h ('k') | ui/app_list/views/app_list_main_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698