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

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

Issue 20656002: Add profile selector menu to app list. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove junk from list_model.h Created 7 years, 5 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 d3791ad9c9a5a556b9046efcb325ea13c1cc1be2..15cb031c1ff4633d0c6330e76c70e389ba24709a 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -90,10 +90,10 @@ AppListMainView::AppListMainView(AppListViewDelegate* delegate,
kInnerPadding,
kInnerPadding));
- search_box_view_ = new SearchBoxView(this, delegate);
+ search_box_view_ = new SearchBoxView(this, delegate, model_);
AddChildView(search_box_view_);
- contents_view_ = new ContentsView(this, pagination_model);
+ contents_view_ = new ContentsView(this, pagination_model, model_);
AddChildView(contents_view_);
search_box_view_->set_contents_view(contents_view_);
@@ -103,9 +103,6 @@ AppListMainView::AppListMainView(AppListViewDelegate* delegate,
contents_view_->SetFillsBoundsOpaquely(false);
contents_view_->layer()->SetMasksToBounds(true);
#endif
-
- search_box_view_->SetModel(model_->search_box());
- contents_view_->SetModel(model_);
}
AppListMainView::~AppListMainView() {

Powered by Google App Engine
This is Rietveld 408576698