mash: Remove shelf util functions; use WmWindow properties.

ash/shelf/shelf_util.h

Index: ash/shelf/shelf_util.h
diff --git a/ash/shelf/shelf_util.h b/ash/shelf/shelf_util.h
deleted file mode 100644
index 3a6eb9bf68bde56cf278ede803d8433765f5303d..0000000000000000000000000000000000000000
--- a/ash/shelf/shelf_util.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// 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.
-
-#ifndef ASH_SHELF_SHELF_UTIL_H_
-#define ASH_SHELF_SHELF_UTIL_H_
-
-#include "ash/ash_export.h"
-#include "ash/common/shelf/shelf_item_types.h"
-#include "ash/common/shelf/shelf_types.h"
-#include "base/strings/string16.h"
-#include "ui/aura/window.h"
-
-namespace aura {
-class Window;
-}
-
-namespace ash {
-
-// A property key to store the id of the ShelfItem associated with the window.
-extern const aura::WindowProperty<ShelfID>* const kShelfID;
-
-// A property key to store the resource id and title of the item shown on the
-// shelf for this window.
-extern const aura::WindowProperty<ShelfItemDetails*>* const
-    kShelfItemDetailsKey;
-
-// Associates ShelfItem of |id| with specified |window|.
-ASH_EXPORT void SetShelfIDForWindow(ShelfID id, aura::Window* window);
-
-// Returns the id of the ShelfItem associated with the specified |window|,
-// or 0 if there isn't one.
-// Note: Window of a tabbed browser will return the |ShelfID| of the
-// currently active tab.
-ASH_EXPORT ShelfID GetShelfIDForWindow(const aura::Window* window);
-
-// Creates a new ShelfItemDetails instance from |details| and sets it for
-// |window|.
-ASH_EXPORT void SetShelfItemDetailsForWindow(aura::Window* window,

[James Cook, 2016/09/14 22:07:10]

I'm so glad all these bare functions are gone.

[msw, 2016/09/14 22:29:14]

Acknowledged.

-                                             const ShelfItemDetails& details);
-
-// Creates a new ShelfItemDetails instance with type DIALOG, image id
-// |image_resource_id|, and title |title|, and sets it for |window|.
-ASH_EXPORT void SetShelfItemDetailsForDialogWindow(aura::Window* window,
-                                                   int image_resource_id,
-                                                   const base::string16& title);
-
-// Clears ShelfItemDetails for |window|.
-// If |window| has a ShelfItem by SetShelfItemDetailsForWindow(), it will
-// be removed.
-ASH_EXPORT void ClearShelfItemDetailsForWindow(aura::Window* window);
-
-// Returns ShelfItemDetails for |window| or NULL if it doesn't have.
-// Returned ShelfItemDetails object is owned by the |window|.
-ASH_EXPORT const ShelfItemDetails* GetShelfItemDetailsForWindow(
-    aura::Window* window);
-
-}  // namespace ash
-
-#endif  // ASH_SHELF_SHELF_UTIL_H_