Manage settings window icon for multi profile

chrome/browser/ui/views/task_manager_view.cc

 // Copyright (c) 2012 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/task_manager/task_manager.h"
 
 #include "base/compiler_specific.h"
 #include "base/metrics/stats_table.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
@@ skipping 23 matching lines @@
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/table/table_grouper.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/controls/table/table_view_observer.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 #if defined(USE_ASH)
+#include "ash/shelf/shelf_util.h"
 #include "ash/wm/window_util.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_util.h"
 #include "grit/ash_resources.h"
 #endif
 
 #if defined(OS_WIN)
 #include "chrome/browser/shell_integration.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 namespace {
@@ skipping 433 matching lines @@
   }
 #endif
   instance_->GetWidget()->Show();
 
   // Set the initial focus to the list of tasks.
   views::FocusManager* focus_manager = instance_->GetFocusManager();
   if (focus_manager)
     focus_manager->SetFocusedView(instance_->tab_table_);
 
 #if defined(USE_ASH)
-  CreateShelfItemForDialog(IDR_ASH_SHELF_ICON_TASK_MANAGER,
-                           instance_->GetWidget()->GetNativeWindow());
+  ash::SetShelfItemDetailsForDialogWindow(
+      instance_->GetWidget()->GetNativeWindow(),
+      IDR_ASH_SHELF_ICON_TASK_MANAGER);
 #endif
 }
 
 // ButtonListener implementation.
 void TaskManagerView::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   typedef ui::ListSelectionModel::SelectedIndices SelectedIndices;
   DCHECK_EQ(kill_button_, sender);
   SelectedIndices selection(tab_table_->selection_model().selected_indices());
@@ skipping 134 matching lines @@
 }  // namespace
 
 namespace chrome {
 
 // Declared in browser_dialogs.h so others don't need to depend on our header.
 void ShowTaskManager(Browser* browser) {
   TaskManagerView::Show(browser);
 }
 
 }  // namespace chrome