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

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: 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
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 faeb59567e2bf604ebb9210365f65ff2eaa24c69..521e98ccbe1fd2e476426c2ba87a7828fca8c276 100644
--- a/ui/app_list/views/app_list_folder_view.cc
+++ b/ui/app_list/views/app_list_folder_view.cc
@@ -57,7 +57,7 @@ AppListFolderView::AppListFolderView(AppsContainerView* container_view,
items_grid_view_ =
new AppsGridView(app_list_main_view_, pagination_model_.get(), NULL);
- 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(),
@@ -227,7 +227,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;

Powered by Google App Engine
This is Rietveld 408576698