mash: Remove shelf util functions; use WmWindow properties.

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/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"
 #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/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ skipping 64 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() {}
   ~SettingsWindowObserver() override {}
 
   // 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:
   DISALLOW_COPY_AND_ASSIGN(SettingsWindowObserver);
 };
 
 BrowserStatusMonitor::BrowserStatusMonitor(
     ChromeLauncherController* launcher_controller)
     : launcher_controller_(launcher_controller),
       settings_window_observer_(new SettingsWindowObserver),
@@ skipping 214 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);
 }