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

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

Issue 682843004: Experimental app list: "All apps" button has a folder-like icon. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ares-allapps-button
Patch Set: Created 6 years, 2 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/all_apps_tile_item_view.cc
diff --git a/ui/app_list/views/all_apps_tile_item_view.cc b/ui/app_list/views/all_apps_tile_item_view.cc
index 7a73fd9b037a7ffbcd6ec6ae4f93c507f07821c0..a0d80999a080680646cf8a81d322d7b2c245d9cc 100644
--- a/ui/app_list/views/all_apps_tile_item_view.cc
+++ b/ui/app_list/views/all_apps_tile_item_view.cc
@@ -15,13 +15,19 @@
namespace app_list {
-AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view)
- : contents_view_(contents_view) {
+AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view,
+ AppListItemList* item_list)
+ : contents_view_(contents_view), folder_image_(item_list) {
SetTitle(l10n_util::GetStringUTF16(IDS_APP_LIST_ALL_APPS));
- // TODO(mgiuca): Set the button's icon.
+ folder_image_.AddObserver(this);
}
AllAppsTileItemView::~AllAppsTileItemView() {
+ folder_image_.RemoveObserver(this);
+}
+
+void AllAppsTileItemView::UpdateIcon() {
+ folder_image_.UpdateIcon();
calamity 2014/10/28 05:12:58 It would be nice not to need this. If FolderImage'
Matt Giuca 2014/10/29 07:11:23 Yeah would be nice... http://google-styleguide.go
}
void AllAppsTileItemView::ButtonPressed(views::Button* sender,
@@ -30,4 +36,8 @@ void AllAppsTileItemView::ButtonPressed(views::Button* sender,
contents_view_->GetPageIndexForNamedPage(ContentsView::NAMED_PAGE_APPS));
}
+void AllAppsTileItemView::OnFolderImageUpdated(const gfx::ImageSkia& icon) {
+ SetIcon(icon);
+}
+
} // namespace app_list

Powered by Google App Engine
This is Rietveld 408576698