Set the shelf icon title explicitly for settings and task manager

ash/shelf/shelf_util.cc

Index: ash/shelf/shelf_util.cc
diff --git a/ash/shelf/shelf_util.cc b/ash/shelf/shelf_util.cc
index de5d3c793fd5ab2fdbcc97af1f99eb4248de87be..f5e26584c0df0c2aa5cb5ca83d4a38370c00038c 100644
--- a/ash/shelf/shelf_util.cc
+++ b/ash/shelf/shelf_util.cc
@@ -40,12 +40,13 @@ void SetShelfItemDetailsForWindow(aura::Window* window,
 }
 
 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);
 }