Replace ShelfItemDelegate::GetTitle() with ShelfItem::title.

ash/common/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/common/shelf/shelf_controller.h"
 
 #include "ash/common/shelf/shelf_item_delegate.h"
 #include "ash/common/shelf/shelf_menu_model.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/wm_lookup.h"
@@ skipping 42 matching lines @@
   void set_title(const base::string16& title) { title_ = title; }
 
  private:
   // This application menu model for ShelfItemDelegateMus lists open windows.
   class ShelfMenuModelMus : public ShelfMenuModel,
                             public ui::SimpleMenuModel::Delegate {
    public:
     explicit ShelfMenuModelMus(ShelfItemDelegateMus* item_delegate)
         : ShelfMenuModel(this), item_delegate_(item_delegate) {
       AddSeparator(ui::SPACING_SEPARATOR);
-      AddItem(0, item_delegate_->GetTitle());
+      AddItem(0, item_delegate_->title());
       AddSeparator(ui::SPACING_SEPARATOR);
       for (const auto& window : item_delegate_->window_id_to_title())
         AddItem(window.first, window.second);
       AddSeparator(ui::SPACING_SEPARATOR);
     }
     ~ShelfMenuModelMus() override {}
 
     // ShelfMenuModel:
     bool IsCommandActive(int command_id) const override { return false; }
 
@@ skipping 19 matching lines @@
       delegate_->LaunchItem();
       return kNewWindowCreated;
     }
     if (window_id_to_title_.size() == 1) {
       // TODO(mash): Activate the window and return kExistingWindowActivated.
       NOTIMPLEMENTED();
     }
     return kNoAction;
   }
 
-  base::string16 GetTitle() override {
-    return window_id_to_title_.empty() ? title_
-                                       : window_id_to_title_.begin()->second;
-  }
-
   ShelfMenuModel* CreateApplicationMenu(int event_flags) override {
     return new ShelfMenuModelMus(this);
   }
 
   void Close() override { NOTIMPLEMENTED(); }
 
   mojom::ShelfItemDelegateAssociatedPtr delegate_;
   bool pinned_ = false;
   std::map<uint32_t, base::string16> window_id_to_title_;
   base::string16 title_;
@@ skipping 107 matching lines @@
   }
 
   ShelfID shelf_id = model_.next_id();
   app_id_to_shelf_id_.insert(std::make_pair(item->app_id, shelf_id));
   shelf_id_to_app_id_.insert(std::make_pair(shelf_id, item->app_id));
 
   ShelfItem shelf_item;
   shelf_item.type = TYPE_APP_SHORTCUT;
   shelf_item.status = STATUS_CLOSED;
   shelf_item.image = GetShelfIconFromBitmap(item->image);
+  shelf_item.title = base::UTF8ToUTF16(item->app_title);
   model_.Add(shelf_item);
 
-  std::unique_ptr<ShelfItemDelegateMus> item_delegate(
-      new ShelfItemDelegateMus());
+  std::unique_ptr<ShelfItemDelegateMus> item_delegate =
+      base::MakeUnique<ShelfItemDelegateMus>();
   item_delegate->SetDelegate(std::move(delegate));
   item_delegate->set_pinned(true);
-  item_delegate->set_title(base::UTF8ToUTF16(item->app_title));
+  item_delegate->set_title(shelf_item.title);
   model_.SetShelfItemDelegate(shelf_id, std::move(item_delegate));
 }
 
 void ShelfController::UnpinItem(const std::string& app_id) {
   if (!app_id_to_shelf_id_.count(app_id))
     return;
 
   ShelfID shelf_id = app_id_to_shelf_id_[app_id];
   ShelfItemDelegateMus* item_delegate = GetShelfItemDelegate(shelf_id);
   DCHECK(item_delegate->pinned());
@@ skipping 11 matching lines @@
     return;
   ShelfID shelf_id = app_id_to_shelf_id_[app_id];
   int index = model_.ItemIndexByID(shelf_id);
   DCHECK_GE(index, 0);
   ShelfItem item = *model_.ItemByID(shelf_id);
   item.image = GetShelfIconFromBitmap(image);
   model_.Set(index, item);
 }
 
 }  // namespace ash