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

ash/common/shelf/shelf_window_watcher.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/common/shelf/shelf_window_watcher.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/shelf/shelf_constants.h"
@@ skipping 21 matching lines @@
   else if (window->GetBoolProperty(WmWindowProperty::DRAW_ATTENTION))
     item->status = STATUS_ATTENTION;
 
   item->app_id = window->GetStringProperty(WmWindowProperty::APP_ID);
 
   // Prefer app icons over window icons, they're typically larger.
   item->image = window->GetAppIcon();
   if (item->image.isNull())
     item->image = window->GetWindowIcon();
 
+  item->title = window->GetTitle();
+
   // Do not show tooltips for visible attached app panel windows.
   item->shows_tooltip =
       item->type != TYPE_APP_PANEL || !window->IsVisible() ||
       !window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED);
 }
 
 }  // namespace
 
 ShelfWindowWatcher::ContainerWindowObserver::ContainerWindowObserver(
     ShelfWindowWatcher* window_watcher)
@@ skipping 50 matching lines @@
     bool visible) {
   // OnWindowVisibilityChanged() is called for descendants too. We only care
   // about changes to the visibility of windows we know about.
   if (!window_watcher_->observed_user_windows_.IsObserving(window))
     return;
 
   // The tooltip behavior for panel windows depends on the panel visibility.
   window_watcher_->OnUserWindowPropertyChanged(window);
 }
 
+void ShelfWindowWatcher::UserWindowObserver::OnWindowTitleChanged(
+    WmWindow* window) {
+  window_watcher_->OnUserWindowPropertyChanged(window);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 ShelfWindowWatcher::ShelfWindowWatcher(ShelfModel* model)
     : model_(model),
       container_window_observer_(this),
       user_window_observer_(this),
       observed_container_windows_(&container_window_observer_),
       observed_user_windows_(&user_window_observer_) {
   WmShell::Get()->AddActivationObserver(this);
   for (WmWindow* root : WmShell::Get()->GetAllRootWindows()) {
@@ skipping 108 matching lines @@
     observed_container_windows_.Add(panel_container);
 }
 
 void ShelfWindowWatcher::OnDisplayRemoved(const display::Display& old_display) {
 }
 
 void ShelfWindowWatcher::OnDisplayMetricsChanged(const display::Display&,
                                                  uint32_t) {}
 
 }  // namespace ash