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

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

Issue 27777002: Implement app list folder management page UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nits. Created 7 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/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 792c5bd8355bdfa59d059de8d239026b526b92cb..0a83325781007d8ec2d2de7a00eb774120487904 100644
--- a/ui/app_list/views/app_list_main_view.cc
+++ b/ui/app_list/views/app_list_main_view.cc
@@ -12,6 +12,7 @@
#include "base/message_loop/message_loop.h"
#include "base/strings/string_util.h"
#include "ui/app_list/app_list_constants.h"
+#include "ui/app_list/app_list_folder_item.h"
#include "ui/app_list/app_list_item_model.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_view_delegate.h"
@@ -190,7 +191,11 @@ void AppListMainView::OnItemIconLoaded(IconLoader* loader) {
}
void AppListMainView::ActivateApp(AppListItemModel* item, int event_flags) {
- item->Activate(event_flags);
+ // TODO(jennyz): Activate the folder via AppListModel notification.
+ if (item->GetAppType() == AppListFolderItem::kAppType)
+ contents_view_->ShowFolderContent(static_cast<AppListFolderItem*>(item));
+ else
+ item->Activate(event_flags);
}
void AppListMainView::GetShortcutPathForApp(

Powered by Google App Engine
This is Rietveld 408576698