Set the shelf icon title explicitly for settings and task manager

ash/shelf/shelf_util.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_util.h"
 
 #include "ash/shelf/shelf_constants.h"
 #include "ui/aura/window_property.h"
 
 DECLARE_WINDOW_PROPERTY_TYPE(ash::ShelfID);
@@ skipping 22 matching lines @@
 }
 
 void SetShelfItemDetailsForWindow(aura::Window* window,
                                   const ShelfItemDetails& details) {
   // |item_details| is owned by |window|.
   ShelfItemDetails* item_details = new ShelfItemDetails(details);
   window->SetProperty(kShelfItemDetailsKey, item_details);
 }
 
 void SetShelfItemDetailsForDialogWindow(aura::Window* window,
-                                        int image_resource_id) {
+                                        int image_resource_id,
+                                        const base::string16& title) {
   // |item_details| is owned by |window|.
   ShelfItemDetails* item_details = new ShelfItemDetails;
   item_details->type = TYPE_DIALOG;
   item_details->image_resource_id = image_resource_id;
-  item_details->title = window->title();
+  item_details->title = title;
   window->SetProperty(kShelfItemDetailsKey, item_details);
 }
 
 void ClearShelfItemDetailsForWindow(aura::Window* window) {
   window->ClearProperty(kShelfItemDetailsKey);
 }
 
 const ShelfItemDetails* GetShelfItemDetailsForWindow(
     aura::Window* window) {
   return window->GetProperty(kShelfItemDetailsKey);
 }
 
 }  // namespace ash