ui/app_list/views/apps_grid_view.cc - Issue 305013014: Disable folder UI when app sync is disabled

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 305013014: Disable folder UI when app sync is disabled (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 6 years, 7 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:

Index: ui/app_list/views/apps_grid_view.cc

diff --git a/ui/app_list/views/apps_grid_view.cc b/ui/app_list/views/apps_grid_view.cc

index 52034d8c024b4de49027bdab98b83935e43982c5..d11a0503554cffdb80c8bd14e67da75e1e842837 100644

--- a/ui/app_list/views/apps_grid_view.cc

+++ b/ui/app_list/views/apps_grid_view.cc

@@ -1989,8 +1989,8 @@ void AppsGridView::OnImplicitAnimationsCompleted() {

bool AppsGridView::EnableFolderDragDropUI() {

// Enable drag and drop folder UI only if it is at the app list root level

// and the switch is on and the target folder can still accept new items.

- return switches::IsFolderUIEnabled() && !folder_delegate_ &&

- CanDropIntoTarget(drop_target_);

+ return model_->folders_enabled() && !folder_delegate_ &&

+ CanDropIntoTarget(drop_target_);

}

bool AppsGridView::CanDropIntoTarget(const Index& drop_target) {