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

ash/shelf/shelf_controller.cc

 // Copyright 2016 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_controller.h"
 
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/remote_shelf_item_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shelf/app_list_shelf_item_delegate.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shell.h"
+#include "ash/strings/grit/ash_strings.h"
 #include "base/auto_reset.h"
 #include "base/strings/utf_string_conversions.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 
 namespace {
 
 // Returns the Shelf instance for the display with the given |display_id|.
 Shelf* GetShelfForDisplay(int64_t display_id) {
   // The controller may be null for invalid ids or for displays being removed.
   RootWindowController* root_window_controller =
       Shell::GetRootWindowControllerWithDisplayId(display_id);
   return root_window_controller ? root_window_controller->shelf() : nullptr;
 }
 
 }  // namespace
 
 ShelfController::ShelfController() {
-  // Create an AppListShelfItemDelegate for the app list item.
+  // Set the delegate and title string for the app list item.
   model_.SetShelfItemDelegate(ShelfID(kAppListId),
                               base::MakeUnique<AppListShelfItemDelegate>());
+  DCHECK_EQ(0, model_.ItemIndexByID(ShelfID(kAppListId)));
+  ShelfItem item = model_.items()[0];
+  item.title = l10n_util::GetStringUTF16(IDS_ASH_SHELF_APP_LIST_LAUNCHER_TITLE);
+  model_.Set(0, item);
+
   model_.AddObserver(this);
 }
 
 ShelfController::~ShelfController() {
   model_.RemoveObserver(this);
 }
 
 void ShelfController::BindRequest(mojom::ShelfControllerRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
@@ skipping 192 matching lines @@
   }
 
   observers_.ForAllPtrs([id, delegate](mojom::ShelfObserver* observer) {
     observer->OnShelfItemDelegateChanged(
         id, delegate ? delegate->CreateInterfacePtrAndBind()
                      : mojom::ShelfItemDelegatePtr());
   });
 }
 
 }  // namespace ash