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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/launcher/launcher_view.cc

Issue 24076002: Disallowing shelf changes via drag & drop if the enterprise profile does not allow changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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 | « ash/launcher/launcher_delegate.h ('k') | ash/shell/launcher_delegate_impl.h » ('j') | ash/shell/launcher_delegate_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_view.cc
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 2e6f9dadb1090c83a9e6408c8b3871385fd31e13..8a77f8922b7911c7f9d5fa90e641d98aef04da9a 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -1176,7 +1176,7 @@ void LauncherView::FinalizeRipOffDrag(bool cancel) {
LauncherView::RemovableState LauncherView::RemovableByRipOff(int index) {
LauncherItemType type = model_->items()[index].type;
- if (type == TYPE_APP_LIST)
+ if (type == TYPE_APP_LIST || !delegate_->CanPin())
return NOT_REMOVABLE;
std::string app_id =
delegate_->GetAppIDForLauncherID(model_->items()[index].id);
« no previous file with comments | « ash/launcher/launcher_delegate.h ('k') | ash/shell/launcher_delegate_impl.h » ('j') | ash/shell/launcher_delegate_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698