Manage settings window icon for multi profile

chrome/browser/ui/ash/launcher/browser_status_monitor.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 "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 
 #include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/settings_window_manager_observer.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ skipping 52 matching lines @@
 // Observes any new settings windows and sets their shelf icon (since they
 // are excluded from BrowserShortcutLauncherItem).
 class BrowserStatusMonitor::SettingsWindowObserver
     : public chrome::SettingsWindowManagerObserver {
  public:
   SettingsWindowObserver() {}
   virtual ~SettingsWindowObserver() {}
 
   // SettingsWindowManagerObserver
   virtual void OnNewSettingsWindow(Browser* settings_browser) OVERRIDE {
-    CreateShelfItemForDialog(IDR_ASH_SHELF_ICON_SETTINGS,
-                             settings_browser->window()->GetNativeWindow());
+    ash::SetShelfItemDetailsForDialogWindow(
+        settings_browser->window()->GetNativeWindow(),
+        IDR_ASH_SHELF_ICON_SETTINGS);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowObserver);
 };
 
 BrowserStatusMonitor::BrowserStatusMonitor(
     ChromeLauncherController* launcher_controller)
     : launcher_controller_(launcher_controller),
       observed_activation_clients_(this),
@@ skipping 283 matching lines @@
     content::WebContents* contents) {
   return launcher_controller_->GetShelfIDForWebContents(contents);
 }
 
 void BrowserStatusMonitor::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   launcher_controller_->GetBrowserShortcutLauncherItemController()->
       SetShelfIDForBrowserWindowContents(browser, web_contents);
 }