mash: Remove shelf util functions; use WmWindow properties.

ash/common/shelf/shelf_constants.h

 // 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_COMMON_SHELF_SHELF_CONSTANTS_H_
 #define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
 
 #include "ash/ash_export.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ skipping 11 matching lines @@
   SHELF_BUTTON_SPACING,
 
   // Size allocated for each app button on the shelf.
   SHELF_BUTTON_SIZE,
 
   // Insets allocated for shelf when it is auto hidden.
   SHELF_INSETS_FOR_AUTO_HIDE
 };
 
 // Invalid image resource id used for ShelfItemDetails.
-extern const int kInvalidImageResourceID;
+const int kInvalidImageResourceID = -1;
 
 // We reserve a small area on the edge of the workspace area to ensure that
 // the resize handle at the edge of the window can be hit.
 extern const int kWorkspaceAreaVisibleInset;
 
 // When autohidden we extend the touch hit target onto the screen so that the
 // user can drag the shelf out.
 extern const int kWorkspaceAreaAutoHideInset;
 
 // Size of the shelf when auto-hidden.
@@ skipping 39 matching lines @@
 extern const int kAppListButtonRadius;
 
 // The direction of the focus cycling.
 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD };
 
 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant);
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_