mash: Move ShelfModel* to ash/public/cpp.

ash/public/cpp/shelf_model.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 "ash/shelf/shelf_model.h"
+#include "ash/public/cpp/shelf_model.h"
 
 #include <algorithm>
 
 #include "ash/public/cpp/shelf_item_delegate.h"
-#include "ash/shelf/shelf_model_observer.h"
-#include "ash/strings/grit/ash_strings.h"
-#include "ui/base/l10n/l10n_util.h"
+#include "ash/public/cpp/shelf_model_observer.h"
 
 namespace ash {
 
 namespace {
 
 int ShelfItemTypeToWeight(ShelfItemType type) {
   switch (type) {
     case TYPE_APP_LIST:
       // TODO(skuhne): If the app list item becomes movable again, this need
       // to be a fallthrough.
@@ skipping 18 matching lines @@
 
 bool CompareByWeight(const ShelfItem& a, const ShelfItem& b) {
   return ShelfItemTypeToWeight(a.type) < ShelfItemTypeToWeight(b.type);
 }
 
 }  // namespace
 
 const char kAppListId[] = "jlfapfmkapbjlfbpjedlinehodkccjee";
 
 ShelfModel::ShelfModel() {
-  // Add the app list item.
+  // Add the app list item; its title and delegate are set in ShelfController.
+  // This avoids an ash/public dep on ash/strings, and a Chrome-side delegate.
   ShelfItem item;
   item.type = TYPE_APP_LIST;
   item.id = ShelfID(kAppListId);
-  item.title = l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE);
   const int index = Add(item);
   DCHECK_EQ(0, index);
 }
 
 ShelfModel::~ShelfModel() = default;
 
 void ShelfModel::PinAppWithID(const std::string& app_id) {
   const ShelfID shelf_id(app_id);
 
   // If the app is already pinned, do nothing and return.
@@ skipping 189 matching lines @@
                    static_cast<ShelfItems::difference_type>(index));
   index = std::min(std::upper_bound(items_.begin(), items_.end(), weight_dummy,
                                     CompareByWeight) -
                        items_.begin(),
                    static_cast<ShelfItems::difference_type>(index));
 
   return index;
 }
 
 }  // namespace ash