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

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

Issue 210583004: Make cancelling of app list correctly clean up folder UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 9 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 | « ui/app_list/views/app_list_folder_view.h ('k') | ui/app_list/views/apps_grid_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_folder_view.cc
diff --git a/ui/app_list/views/app_list_folder_view.cc b/ui/app_list/views/app_list_folder_view.cc
index 6116c949a4571db9441fc366536205b5d7929130..d51d67ff906724e622e51bf67fa319c08379723e 100644
--- a/ui/app_list/views/app_list_folder_view.cc
+++ b/ui/app_list/views/app_list_folder_view.cc
@@ -56,7 +56,7 @@ AppListFolderView::AppListFolderView(AppsContainerView* container_view,
items_grid_view_ =
new AppsGridView(app_list_main_view_, pagination_model_.get());
- items_grid_view_->set_is_root_level(false);
+ items_grid_view_->set_folder_delegate(this);
items_grid_view_->SetLayout(
kPreferredIconDimension,
container_view->apps_grid_view()->cols(),
@@ -226,7 +226,7 @@ void AppListFolderView::UpdateFolderNameVisibility(bool visible) {
folder_header_view_->UpdateFolderNameVisibility(visible);
}
-bool AppListFolderView::IsPointOutsideOfFolderBoundray(
+bool AppListFolderView::IsPointOutsideOfFolderBoundary(
const gfx::Point& point) {
if (!GetLocalBounds().Contains(point))
return true;
« no previous file with comments | « ui/app_list/views/app_list_folder_view.h ('k') | ui/app_list/views/apps_grid_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698