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

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

Issue 35783003: Revert 230227 "Implement app list folder management page UI, inc..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/ui/app_list/views/app_list_main_view.h ('k') | trunk/src/ui/app_list/views/app_list_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/app_list/views/app_list_main_view.cc
===================================================================
--- trunk/src/ui/app_list/views/app_list_main_view.cc (revision 230254)
+++ trunk/src/ui/app_list/views/app_list_main_view.cc (working copy)
@@ -12,7 +12,6 @@
#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"
@@ -191,11 +190,7 @@
}
void AppListMainView::ActivateApp(AppListItemModel* item, int 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);
+ item->Activate(event_flags);
}
void AppListMainView::GetShortcutPathForApp(
« no previous file with comments | « trunk/src/ui/app_list/views/app_list_main_view.h ('k') | trunk/src/ui/app_list/views/app_list_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698