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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/common/shelf/shelf_view.cc

Issue 2608013002: mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy. (Closed)
Patch Set: Created 3 years, 12 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
« ash/common/shelf/shelf_item_delegate.h ('K') | « ash/common/shelf/shelf_item_types.h ('k') | ash/common/shelf/shelf_window_watcher_item_delegate.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_view.cc
diff --git a/ash/common/shelf/shelf_view.cc b/ash/common/shelf/shelf_view.cc
index f85e154d9afd5d624384a0ff9b3e426de97b7681..35eaa3c53415f5662a259dc2568603cc04888409 100644
--- a/ash/common/shelf/shelf_view.cc
+++ b/ash/common/shelf/shelf_view.cc
@@ -1352,9 +1352,7 @@ ShelfView::RemovableState ShelfView::RemovableByRipOff(int index) const {
return NOT_REMOVABLE;
std::string app_id = delegate_->GetAppIDForShelfID(model_->items()[index].id);
James Cook 2017/01/04 17:32:17 nit: move this down near 1357
msw 2017/01/04 22:23:04 Done.
- ShelfItemDelegate* item_delegate =
- model_->GetShelfItemDelegate(model_->items()[index].id);
- if (!item_delegate->CanPin())
+ if (model_->items()[index].pinned_by_policy)
return NOT_REMOVABLE;
// Note: Only pinned app shortcuts can be removed!
return (type == TYPE_APP_SHORTCUT && delegate_->IsAppPinned(app_id))
« ash/common/shelf/shelf_item_delegate.h ('K') | « ash/common/shelf/shelf_item_types.h ('k') | ash/common/shelf/shelf_window_watcher_item_delegate.h » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698