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

Unified Diff: ash/shelf/shelf_view.cc

Issue 132543003: Add LauncherItem for TaskManager Dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 11 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 | « no previous file | chrome/browser/ui/ash/launcher/launcher_item_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index b387e255bb57d2568e5202fe57c36e90b2aa83a5..368484389a3daf4e69bd6306a2fdd89a5ebdca41 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1235,8 +1235,9 @@ void ShelfView::FinalizeRipOffDrag(bool cancel) {
ShelfView::RemovableState ShelfView::RemovableByRipOff(int index) {
DCHECK(index >= 0 && index < model_->item_count());
LauncherItemType type = model_->items()[index].type;
- if (type == TYPE_APP_LIST || !delegate_->CanPin())
+ if (type == TYPE_APP_LIST || type == TYPE_DIALOG || !delegate_->CanPin())
return NOT_REMOVABLE;
+
std::string app_id =
delegate_->GetAppIDForLauncherID(model_->items()[index].id);
// Note: Only pinned app shortcuts can be removed!
« no previous file with comments | « no previous file | chrome/browser/ui/ash/launcher/launcher_item_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698