mash: Replace ShelfItemDelegate::CanPin with ShelfItem::pinned_by_policy.

chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 381 matching lines @@
     return;  // May happen if item closed with menu open.
 
   if (IsPinned(id))
     Unpin(id);
   else
     Pin(id);
 }
 
 bool ChromeLauncherControllerImpl::IsPinnable(ash::ShelfID id) const {
   const ash::ShelfItem* item = GetItem(id);
-  return (item && (item->type == ash::TYPE_APP_SHORTCUT ||
-                   item->type == ash::TYPE_APP) &&
-          model_->GetShelfItemDelegate(id)->CanPin());
+  return item && !item->pinned_by_policy &&

[James Cook, 2017/01/04 17:32:17]

nit: The !pinned_by_policy part is a bit confusing. This could use a comment
that it really means that the user can toggle pin/unpin state, or rename the
function to something like CanUserPin().

[msw, 2017/01/04 22:23:04]

Moved into LauncherContextMenu::IsCommandIdEnabled and commented.

+         (item->type == ash::TYPE_APP_SHORTCUT || item->type == ash::TYPE_APP);
 }
 
 void ChromeLauncherControllerImpl::LockV1AppWithID(const std::string& app_id) {
   ash::ShelfID id = GetShelfIDForAppID(app_id);
   if (id == ash::kInvalidShelfID) {
     CreateAppShortcutLauncherItemWithType(ash::launcher::AppLauncherId(app_id),
                                           model_->item_count(), ash::TYPE_APP);
     id = GetShelfIDForAppID(app_id);
   }
   CHECK(id);
@@ skipping 787 matching lines @@
     DCHECK_NE(controller->app_id(), extension_misc::kChromeAppId);
 
     if (item.status != ash::STATUS_CLOSED || controller->locked()) {
       UnpinRunningAppInternal(index);
       // Note, item can be moved to the right due weighting in shelf model.
       DCHECK_GE(model_->ItemIndexByID(item.id), index);
     } else {
       LauncherItemClosed(item.id);
     }
   }
+
+  // Update the policy-pinned flag for each item on the shelf.

[James Cook, 2017/01/04 17:32:17]

Not your fault, but this function is too long. Please put your code in a utility
function and/or refactor this function into smaller pieces.

[msw, 2017/01/04 22:23:04]

Done.

+  for (index = 0; index < model_->item_count(); index++) {
+    ash::ShelfItem item = model_->items()[index];
+    const bool pinned_by_policy = GetPinnableForAppID(item.app_id, profile()) ==
+                                  AppListControllerDelegate::PIN_FIXED;

[James Cook, 2017/01/04 17:32:17]

optional: It's pretty confusing that PIN_FIXED lives in
AppListControllerDelegate. Maybe it should be a raw enum or enum class in
chrome_launcher_types.h

[msw, 2017/01/04 22:23:04]

Doesn't make sense to move the enum in this cl.

+    if (item.pinned_by_policy != pinned_by_policy) {
+      item.pinned_by_policy = pinned_by_policy;
+      model_->Set(index, item);
+    }
+  }
 }
 
 void ChromeLauncherControllerImpl::SetVirtualKeyboardBehaviorFromPrefs() {
   const PrefService* service = profile()->GetPrefs();
   const bool was_enabled = keyboard::IsKeyboardEnabled();
   if (!service->HasPrefPath(prefs::kTouchVirtualKeyboardEnabled)) {
     keyboard::SetKeyboardShowOverride(keyboard::KEYBOARD_SHOW_OVERRIDE_NONE);
   } else {
     const bool enable =
         service->GetBoolean(prefs::kTouchVirtualKeyboardEnabled);
@@ skipping 236 matching lines @@
     LauncherItemController* controller = GetLauncherItemController(item.id);
     if (!controller || controller->image_set_by_controller())
       continue;
     item.image = image;
     if (arc_deferred_launcher_)
       arc_deferred_launcher_->MaybeApplySpinningEffect(id, &item.image);
     model_->Set(index, item);
     // It's possible we're waiting on more than one item, so don't break.
   }
 }