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

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: small fixups 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..1e7c5b5436dee5f73426ab7f214a783b7387bb5a 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -104,7 +104,7 @@ AppListMainView::AppListMainView(AppListViewDelegate* delegate,
contents_view_->layer()->SetMasksToBounds(true);
#endif
- search_box_view_->SetModel(model_->search_box());
+ search_box_view_->SetModel(model_);
contents_view_->SetModel(model_);
}
@@ -112,6 +112,12 @@ AppListMainView::~AppListMainView() {
pending_icon_loaders_.clear();
}
+void AppListMainView::SetModel(AppListModel* model) {
+ model_ = model;
+ search_box_view_->SetModel(model_);
+ contents_view_->SetModel(model_);
+}
+
void AppListMainView::ShowAppListWhenReady() {
if (pending_icon_loaders_.empty()) {
icon_loading_wait_timer_.Stop();

Powered by Google App Engine
This is Rietveld 408576698