mash: Remove shelf util functions; use WmWindow properties.

chrome/browser/ui/ash/launcher/multi_profile_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/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"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 60 matching lines @@
 
   // Remove settings window icons not associated with this profile and create
   // icons for windows associated with the current profile.
   for (BrowserList::const_iterator it = browser_list->begin();
        it != browser_list->end(); ++it) {
     Browser* browser = *it;
     if (!chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(
             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();
     }
   }
 
   // Update the browser state since some of the removals / adds above might have
   // had an impact on the browser item.
   UpdateBrowserItemState();
 }
 
 void MultiProfileBrowserStatusMonitor::AddV1AppToShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
@@ skipping 27 matching lines @@
 
 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
     Browser* browser) {
   // Removing a V1 app from the launcher requires to remove the content and
   // the launcher item.
   launcher_controller_->UpdateAppState(
       browser->tab_strip_model()->GetActiveWebContents(),
       ChromeLauncherController::APP_STATE_REMOVED);
   BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
 }