mash: Remove shelf util functions; use WmWindow properties.

chrome/browser/ui/ash/launcher/browser_status_monitor.cc

Index: chrome/browser/ui/ash/launcher/browser_status_monitor.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
index 61b348a6b268fd80db175237a6b5a77078b43bc6..002dc296b607f0717585af1b4b264581dd454bee 100644
--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 
+#include "ash/aura/wm_window_aura.h"
+#include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/wm_window_property.h"
 #include "ash/resources/grit/ash_resources.h"
-#include "ash/shelf/shelf_util.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/macros.h"
@@ -90,10 +92,12 @@ class BrowserStatusMonitor::SettingsWindowObserver
 
   // SettingsWindowManagerObserver
   void OnNewSettingsWindow(Browser* settings_browser) override {
-    ash::SetShelfItemDetailsForDialogWindow(
-        settings_browser->window()->GetNativeWindow(),
-        IDR_ASH_SHELF_ICON_SETTINGS,
-        l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
+    ash::ShelfItemDetails item_details;
+    item_details.type = ash::TYPE_DIALOG;
+    item_details.image_resource_id = IDR_ASH_SHELF_ICON_SETTINGS;
+    item_details.title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
+    aura::Window* aura_window = settings_browser->window()->GetNativeWindow();
+    ash::WmWindowAura::Get(aura_window)->SetShelfItemDetails(item_details);
   }
 
  private: