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

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

 // Copyright 2014 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/app_window_launcher_item_controller.h"
 
 #include <algorithm>
 
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 92 matching lines @@
   if (index >= windows_.size())
     return;
   auto it = windows_.begin();
   std::advance(it, index);
   ShowAndActivateOrMinimize(*it);
 }
 
 ChromeLauncherAppMenuItems AppWindowLauncherItemController::GetApplicationList(
     int event_flags) {
   ChromeLauncherAppMenuItems items;
+  // Add the application name to the menu.
+  base::string16 app_title = LauncherControllerHelper::GetAppTitle(
+      launcher_controller()->profile(), app_id());
   items.push_back(
-      base::MakeUnique<ChromeLauncherAppMenuItem>(GetTitle(), nullptr, false));
+      base::MakeUnique<ChromeLauncherAppMenuItem>(app_title, nullptr, false));
   return items;
 }
 
 ash::ShelfItemDelegate::PerformedAction
 AppWindowLauncherItemController::ItemSelected(const ui::Event& event) {
   if (windows_.empty())
     return kNoAction;
 
   ui::BaseWindow* window_to_show =
       last_active_window_ ? last_active_window_ : windows_.front();
   // If the event was triggered by a keystroke, we try to advance to the next
   // item if the window we are trying to activate is already active.
   if (windows_.size() >= 1 && window_to_show->IsActive() &&
       event.type() == ui::ET_KEY_RELEASED) {
     return ActivateOrAdvanceToNextAppWindow(window_to_show);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
 }
 
-base::string16 AppWindowLauncherItemController::GetTitle() {
-  return LauncherControllerHelper::GetAppTitle(launcher_controller()->profile(),
-                                               app_id());
-}
-
 void AppWindowLauncherItemController::OnWindowPropertyChanged(
     aura::Window* window,
     const void* key,
     intptr_t old) {
   if (key == aura::client::kDrawAttentionKey) {
     ash::ShelfItemStatus status;
     if (ash::wm::IsActiveWindow(window)) {
       status = ash::STATUS_ACTIVE;
     } else if (window->GetProperty(aura::client::kDrawAttentionKey)) {
       status = ash::STATUS_ATTENTION;
@@ skipping 26 matching lines @@
   if (window_to_show->IsActive()) {
     // Coming here, only a single window is active. For keyboard activations
     // the window gets animated.
     AnimateWindow(window_to_show->GetNativeWindow(),
                   wm::WINDOW_ANIMATION_TYPE_BOUNCE);
   } else {
     return ShowAndActivateOrMinimize(window_to_show);
   }
   return kNoAction;
 }