mash: Remove shelf util functions; use WmWindow properties.

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

Index: chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
index be11a7e48c02420abdaf26fa9f26bcbaf11faf19..ab3fb69fce167516aa2cab3921620ca76371daf2 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/ui/ash/launcher/multi_profile_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 "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
@@ -86,13 +88,15 @@ void MultiProfileBrowserStatusMonitor::ActiveUserChanged(
             browser)) {
       continue;
     }
+    aura::Window* aura_window = browser->window()->GetNativeWindow();
     if (multi_user_util::IsProfileFromActiveUser(browser->profile())) {
-      ash::SetShelfItemDetailsForDialogWindow(
-      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);
+      ash::WmWindowAura::Get(aura_window)->SetShelfItemDetails(item_details);
     } else {
-      ash::ClearShelfItemDetailsForWindow(browser->window()->GetNativeWindow());
+      ash::WmWindowAura::Get(aura_window)->ClearShelfItemDetails();
     }
   }